b4b788e8d5 
								
							
								 
							
						 
						
							
							
								
								Fix right margin for events on IRC layout  
							
							... 
							
							
							
							Fixes  vector-im/element-web#18354  
						
							2021-08-04 11:21:52 +02:00  
				
					
						
							
							
								 
						
							
							
								d479373af9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-04 09:21:45 +02:00  
				
					
						
							
							
								 
						
							
							
								1b87ffb7cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6527  from SimonBrandner/fix/font-topic/18339  
							
							... 
							
							
							
							Fix the wrong font being used in the room topic field 
							
						 
						
							2021-08-03 10:06:58 +01:00  
				
					
						
							
							
								 
						
							
							
								3ea0571c5f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6486  from SimonBrandner/feature/muting  
							
							... 
							
							
							
							Show an avatar/a turned off microphone icon for muted users 
							
						 
						
							2021-08-02 17:20:55 +01:00  
				
					
						
							
							
								 
						
							
							
								2dc13dedf0 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix font  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-02 15:38:45 +02:00  
				
					
						
							
							
								 
						
							
							
								442992b30e 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix symbol entry in the in-call dialpad ( #6521 )  
							
							... 
							
							
							
							The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.
RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786 ,
however its removal seems to have had no adverse affects
from testing. 
							
						 
						
							2021-08-02 10:18:17 +01:00  
				
					
						
							
							
								 
						
							
							
								dd53324981 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6509  from matrix-org/travis/voice-messages/download-2  
							
							... 
							
							
							
							Improve download interactions 
							
						 
						
							2021-07-30 10:50:27 -06:00  
				
					
						
							
							
								 
						
							
							
								27e432df4b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6513  from matrix-org/jano/fix-link-decoration  
							
							... 
							
							
							
							Fix inconsistent styling for links on hover 
							
						 
						
							2021-07-30 14:08:15 +02:00  
				
					
						
							
							
								 
						
							
							
								42d6afd4b1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6497  from matrix-org/t3chguy/fix/18093  
							
							
							
						 
						
							2021-07-30 12:25:44 +01:00  
				
					
						
							
							
								 
						
							
							
								adfbcdce40 
								
							
								 
							
						 
						
							
							
								
								Fix the inconsistent styling between non-markdown and markdown parsed links on hover.  
							
							... 
							
							
							
							It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message).
https://webaim.org/techniques/hypertext/link_text#underlining  
							
						 
						
							2021-07-30 09:54:28 +02:00  
				
					
						
							
							
								 
						
							
							
								11322b8999 
								
							
								 
							
						 
						
							
							
								
								Appease linter  
							
							
							
						 
						
							2021-07-30 09:19:34 +02:00  
				
					
						
							
							
								 
						
							
							
								375f7b670a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/fix-18144  
							
							
							
						 
						
							2021-07-30 08:10:15 +01:00  
				
					
						
							
							
								 
						
							
							
								fb89b45c06 
								
							
								 
							
						 
						
							
							
								
								Unify and improve download interactions  
							
							... 
							
							
							
							With help from Palid.
This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).
The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe. 
							
						 
						
							2021-07-29 15:36:50 -06:00  
				
					
						
							
							
								 
						
							
							
								02dbdc5c0a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-07-29 16:11:16 +01:00  
				
					
						
							
							
								 
						
							
							
								94af6db201 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6424  from matrix-org/t3chguy/fix/18071  
							
							
							
						 
						
							2021-07-29 15:57:26 +01:00  
				
					
						
							
							
								 
						
							
							
								3ee8f607c0 
								
							
								 
							
						 
						
							
							
								
								Switch dropdown out for radio interaction when leaving space  
							
							
							
						 
						
							2021-07-29 15:50:18 +01:00  
				
					
						
							
							
								 
						
							
							
								493cd01ed3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071  
							
							... 
							
							
							
							 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx 
							
						 
						
							2021-07-29 15:22:52 +01:00  
				
					
						
							
							
								 
						
							
							
								efd8a2f9b0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-07-29 15:16:53 +01:00  
				
					
						
							
							
								 
						
							
							
								f69b4549dd 
								
							
								 
							
						 
						
							
							
								
								Re-add top border stroke in space create menu  
							
							
							
						 
						
							2021-07-29 15:13:02 +01:00  
				
					
						
							
							
								 
						
							
							
								dac3eda9e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6499  from matrix-org/gsouquet/fix-18195  
							
							... 
							
							
							
							Prevent timeline flickering on hover 
							
						 
						
							2021-07-29 14:33:34 +01:00  
				
					
						
							
							
								 
						
							
							
								cb89dd408c 
								
									
								
							
								 
							
						 
						
							
							
								
								Use mic mute icons  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-29 15:05:26 +02:00  
				
					
						
							
							
								 
						
							
							
								ab56a16907 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6458  from matrix-org/t3chguy/fix/18091  
							
							
							
						 
						
							2021-07-29 13:20:19 +01:00  
				
					
						
							
							
								 
						
							
							
								3bd393f16b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6501  from matrix-org/gsouquet/fix-18249  
							
							... 
							
							
							
							Restore pointer cursor for SenderProfile in message bubbles 
							
						 
						
							2021-07-29 12:20:56 +01:00  
				
					
						
							
							
								 
						
							
							
								6c68f779ec 
								
							
								 
							
						 
						
							
							
								
								Restore pointer cursor for SenderProfile in message bubbles  
							
							
							
						 
						
							2021-07-29 11:58:32 +02:00  
				
					
						
							
							
								 
						
							
							
								9c4101fa89 
								
							
								 
							
						 
						
							
							
								
								Align event list summary read receipts when using message bubbles  
							
							
							
						 
						
							2021-07-29 11:48:22 +02:00  
				
					
						
							
							
								 
						
							
							
								78a9117598 
								
							
								 
							
						 
						
							
							
								
								Prevent timeline flickering on hover  
							
							
							
						 
						
							2021-07-29 11:12:07 +02:00  
				
					
						
							
							
								 
						
							
							
								e140dd6ba1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/fix-18132  
							
							
							
						 
						
							2021-07-29 10:27:00 +02:00  
				
					
						
							
							
								 
						
							
							
								ee7f3c000d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/fix-18144  
							
							
							
						 
						
							2021-07-29 10:04:47 +02:00  
				
					
						
							
							
								 
						
							
							
								9fb1c8e4cd 
								
							
								 
							
						 
						
							
							
								
								Iterate PR  
							
							
							
						 
						
							2021-07-28 19:33:07 +01:00  
				
					
						
							
							
								 
						
							
							
								ac800ad94d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093  
							
							
							
						 
						
							2021-07-28 19:24:26 +01:00  
				
					
						
							
							
								 
						
							
							
								40493634ae 
								
							
								 
							
						 
						
							
							
								
								Iterate PR  
							
							
							
						 
						
							2021-07-28 19:23:33 +01:00  
				
					
						
							
							
								 
						
							
							
								5d9e421de0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091  
							
							
							
						 
						
							2021-07-28 17:58:34 +01:00  
				
					
						
							
							
								 
						
							
							
								a5606c72de 
								
							
								 
							
						 
						
							
							
								
								Update feedback prompt to match designs  
							
							
							
						 
						
							2021-07-28 17:56:57 +01:00  
				
					
						
							
							
								 
						
							
							
								6123ccb2eb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096  
							
							
							
						 
						
							2021-07-28 17:45:15 +01:00  
				
					
						
							
							
								 
						
							
							
								67ef263940 
								
							
								 
							
						 
						
							
							
								
								Refactor SpaceButton to be more reusable and add context menu to Home button  
							
							
							
						 
						
							2021-07-28 17:40:33 +01:00  
				
					
						
							
							
								 
						
							
							
								cdf0d98c3f 
								
							
								 
							
						 
						
							
							
								
								Fix IconizedContextMenuCheckbox layout  
							
							
							
						 
						
							2021-07-28 17:39:02 +01:00  
				
					
						
							
							
								 
						
							
							
								07b9d6b30b 
								
							
								 
							
						 
						
							
							
								
								Fix styling of setting flag descriptions in preferences  
							
							... 
							
							
							
							and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card 
							
						 
						
							2021-07-28 14:39:19 +01:00  
				
					
						
							
							
								 
						
							
							
								771dda0341 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6472  from SimonBrandner/fix/call-view/18221  
							
							
							
						 
						
							2021-07-28 11:10:37 +01:00  
				
					
						
							
							
								 
						
							
							
								a4cf147d72 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/fix-18264  
							
							
							
						 
						
							2021-07-28 10:30:29 +02:00  
				
					
						
							
							
								 
						
							
							
								3694006d05 
								
							
								 
							
						 
						
							
							
								
								Realign reactions row with messages in modern layout  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-07-27 23:48:51 -04:00  
				
					
						
							
							
								 
						
							
							
								9707797d45 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6272  from SimonBrandner/fix/explicit-font/14163  
							
							... 
							
							
							
							Don't set `font-family` explicitly 
							
						 
						
							2021-07-27 11:04:23 -06:00  
				
					
						
							
							
								 
						
							
							
								8294d324e3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221  
							
							
							
						 
						
							2021-07-27 16:55:59 +02:00  
				
					
						
							
							
								 
						
							
							
								24f0c760ce 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-27 16:25:38 +02:00  
				
					
						
							
							
								 
						
							
							
								3037be11c4 
								
							
								 
							
						 
						
							
							
								
								Restore padding for single person state events  
							
							
							
						 
						
							2021-07-27 16:24:05 +02:00  
				
					
						
							
							
								 
						
							
							
								39d9ec3ced 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/fix/18071  
							
							
							
						 
						
							2021-07-27 15:02:59 +01:00  
				
					
						
							
							
								 
						
							
							
								148571828b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6474  from matrix-org/gsouquet/fix-18017  
							
							... 
							
							
							
							Make new reply UI clickable 
							
						 
						
							2021-07-27 13:57:41 +01:00  
				
					
						
							
							
								 
						
							
							
								72becb73e1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6473  from matrix-org/gsouquet/fix-18208  
							
							... 
							
							
							
							Fix deleted message left offset in the timeline 
							
						 
						
							2021-07-27 13:40:20 +01:00  
				
					
						
							
							
								 
						
							
							
								59e9704ee8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6481  from matrix-org/t3chguy/fix/18250  
							
							... 
							
							
							
							Fix broken layout of the space hierarchy view 
							
						 
						
							2021-07-27 13:19:04 +01:00  
				
					
						
							
							
								 
						
							
							
								50aee28bf0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6480  from matrix-org/gsouquet/fix-18137  
							
							... 
							
							
							
							Add data-layout to MELS for better CSS structure 
							
						 
						
							2021-07-27 13:15:02 +01:00  
				
					
						
							
							
								 
						
							
							
								0c79aec19d 
								
							
								 
							
						 
						
							
							
								
								Fix broken layout of the space hierarchy view  
							
							... 
							
							
							
							Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself 
							
						 
						
							2021-07-27 13:09:43 +01:00