b4fbc791bb 
								
							
								 
							
						 
						
							
							
								
								Add experimental options to the Spaces beta  
							
							
							
						 
						
							2021-06-16 09:01:13 +01:00  
				
					
						
							
							
								 
						
							
							
								d08495bde6 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix display name overlap  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-15 06:30:22 +02:00  
				
					
						
							
							
								 
						
							
							
								6b4f63df2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6184  from matrix-org/t3chguy/rs/5566  
							
							
							
						 
						
							2021-06-14 23:27:51 +01:00  
				
					
						
							
							
								 
						
							
							
								539465ecb4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx 
							
						 
						
							2021-06-14 22:22:30 +01:00  
				
					
						
							
							
								 
						
							
							
								f8eea2ae23 
								
							
								 
							
						 
						
							
							
								
								Fix word wrap in space descriptions  
							
							
							
						 
						
							2021-06-14 22:18:02 +01:00  
				
					
						
							
							
								 
						
							
							
								91df392a2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5880  from SimonBrandner/show-username  
							
							
							
						 
						
							2021-06-14 21:34:01 +01:00  
				
					
						
							
							
								 
						
							
							
								5343be7814 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix buggy hovering/selecting of event tiles  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-10 18:53:56 +02:00  
				
					
						
							
							
								 
						
							
							
								8174973cfe 
								
									
								
							
								 
							
						 
						
							
							
								
								Use the same styling as for mx_TextualEvent  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-10 15:31:27 +02:00  
				
					
						
							
							
								 
						
							
							
								15132074e2 
								
							
								 
							
						 
						
							
							
								
								Restore copy button icon when sharing permalink  
							
							
							
						 
						
							2021-06-09 13:44:31 +01:00  
				
					
						
							
							
								 
						
							
							
								fccd71f82e 
								
									
								
							
								 
							
						 
						
							
							
								
								Update styling based on review  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-09 06:23:51 +02:00  
				
					
						
							
							
								 
						
							
							
								f34a2e61bc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365  
							
							
							
						 
						
							2021-06-08 16:54:49 +01:00  
				
					
						
							
							
								 
						
							
							
								34cc494a8e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6140  from matrix-org/t3chguy/fix/17553  
							
							
							
						 
						
							2021-06-08 16:45:35 +01:00  
				
					
						
							
							
								 
						
							
							
								bf77a4a2ab 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into show-username  
							
							
							
						 
						
							2021-06-08 17:14:42 +02:00  
				
					
						
							
							
								 
						
							
							
								372f24ff99 
								
							
								 
							
						 
						
							
							
								
								Hide download links from forward dialog preview  
							
							... 
							
							
							
							since trying to interact with them is pointless.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-07 19:19:14 -04:00  
				
					
						
							
							
								 
						
							
							
								b97867271b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-06-07 19:09:36 -04:00  
				
					
						
							
							
								 
						
							
							
								801b5f9c1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6155  from matrix-org/t3chguy/spacesteammatewarning  
							
							... 
							
							
							
							Add warning to private space creation flow 
							
						 
						
							2021-06-07 22:21:07 +01:00  
				
					
						
							
							
								 
						
							
							
								025148d9fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into show-username  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 19:37:22 +02:00  
				
					
						
							
							
								 
						
							
							
								a895b083a2 
								
							
								 
							
						 
						
							
							
								
								Fix notif panel timestamp padding  
							
							... 
							
							
							
							This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.
Fixes https://github.com/vector-im/element-web/issues/17580  
							
						 
						
							2021-06-07 16:21:53 +01:00  
				
					
						
							
							
								 
						
							
							
								f3aa505673 
								
							
								 
							
						 
						
							
							
								
								Add warning to private space creation flow  
							
							
							
						 
						
							2021-06-07 14:14:31 +01:00  
				
					
						
							
							
								 
						
							
							
								bd8fd77d54 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6148  from robintown/fix-timestamps  
							
							
							
						 
						
							2021-06-07 13:12:11 +01:00  
				
					
						
							
							
								 
						
							
							
								ea2120bdfd 
								
							
								 
							
						 
						
							
							
								
								Fix timestamps  
							
							... 
							
							
							
							7f83590846 
						
							2021-06-06 01:55:01 -04:00  
				
					
						
							
							
								 
						
							
							
								e891d18fa2 
								
							
								 
							
						 
						
							
							
								
								Add my email to my copyright notices  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:41:28 -04:00  
				
					
						
							
							
								 
						
							
							
								17edfec3aa 
								
							
								 
							
						 
						
							
							
								
								Make it easier to pan images in the lightbox  
							
							... 
							
							
							
							Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-05 21:08:44 -04:00  
				
					
						
							
							
								 
						
							
							
								a06306d560 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-06-05 11:04:17 -04:00  
				
					
						
							
							
								 
						
							
							
								93f41ce0ab 
								
							
								 
							
						 
						
							
							
								
								Actually finish the empty state for the pinned messages card  
							
							
							
						 
						
							2021-06-04 11:35:17 +01:00  
				
					
						
							
							
								 
						
							
							
								93010d34fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/fix/6606  
							
							
							
						 
						
							2021-06-03 19:33:09 +01:00  
				
					
						
							
							
								 
						
							
							
								0c97d90fb9 
								
							
								 
							
						 
						
							
							
								
								Iterate PR based on feedback  
							
							
							
						 
						
							2021-06-03 16:44:28 +01:00  
				
					
						
							
							
								 
						
							
							
								a36063704d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6138  from matrix-org/gsouquet/containment-event  
							
							... 
							
							
							
							Fix mx_Event containment rules and empty read avatar row 
							
						 
						
							2021-06-03 16:38:55 +01:00  
				
					
						
							
							
								 
						
							
							
								5ef78f43a4 
								
							
								 
							
						 
						
							
							
								
								fix containment rule to keep height when resizing vertically  
							
							
							
						 
						
							2021-06-03 16:26:20 +01:00  
				
					
						
							
							
								 
						
							
							
								f2643151c6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx 
							
						 
						
							2021-06-03 16:22:59 +01:00  
				
					
						
							
							
								 
						
							
							
								7f83590846 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6079  from matrix-org/gsouquet/switch-rooms  
							
							
							
						 
						
							2021-06-03 08:44:01 +01:00  
				
					
						
							
							
								 
						
							
							
								4f50727010 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx 
							
						 
						
							2021-06-03 08:42:05 +01:00  
				
					
						
							
							
								 
						
							
							
								a34f8a29f4 
								
							
								 
							
						 
						
							
							
								
								fix mx_Event containment rules and empty read avatar row  
							
							
							
						 
						
							2021-06-03 08:41:12 +01:00  
				
					
						
							
							
								 
						
							
							
								430cfa9c06 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6127  from matrix-org/gsouquet/css-containment  
							
							... 
							
							
							
							Add CSS containment rules for shorter reflow operations 
							
						 
						
							2021-06-03 08:10:29 +01:00  
				
					
						
							
							
								 
						
							
							
								bc50028f70 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash  
							
							
							
						 
						
							2021-06-02 13:57:33 +01:00  
				
					
						
							
							
								 
						
							
							
								9d126c51e4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6113  from matrix-org/gsouquet/improve-layout-rendering  
							
							
							
						 
						
							2021-06-02 11:41:59 +01:00  
				
					
						
							
							
								 
						
							
							
								2d50325836 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6133  from matrix-org/jryans/event-tile-radius  
							
							... 
							
							
							
							Tweak event border radius to match action bar 
							
						 
						
							2021-06-02 11:39:54 +01:00  
				
					
						
							
							
								 
						
							
							
								234c65b331 
								
							
								 
							
						 
						
							
							
								
								Tweak event border radius to match action bar  
							
							... 
							
							
							
							This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066 ). 
							
						 
						
							2021-06-02 10:25:29 +01:00  
				
					
						
							
							
								 
						
							
							
								8efbdd0406 
								
							
								 
							
						 
						
							
							
								
								Match forward dialog send failed indicator color with button  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-01 17:56:46 -04:00  
				
					
						
							
							
								 
						
							
							
								56714525f2 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-06-01 17:28:55 -04:00  
				
					
						
							
							
								 
						
							
							
								ebd7cd6212 
								
							
								 
							
						 
						
							
							
								
								Add CSS containement rules for shorter reflow operations  
							
							
							
						 
						
							2021-06-01 11:26:32 +01:00  
				
					
						
							
							
								 
						
							
							
								b2f01b8438 
								
							
								 
							
						 
						
							
							
								
								Respect newlines in space topics  
							
							
							
						 
						
							2021-06-01 10:48:53 +01:00  
				
					
						
							
							
								 
						
							
							
								d894cc6f7a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/switch-rooms  
							
							
							
						 
						
							2021-06-01 09:02:28 +01:00  
				
					
						
							
							
								 
						
							
							
								18188538f6 
								
							
								 
							
						 
						
							
							
								
								Move the read receipt animation to the compositing layer  
							
							
							
						 
						
							2021-05-28 14:59:54 +01:00  
				
					
						
							
							
								 
						
							
							
								caaef63077 
								
							
								 
							
						 
						
							
							
								
								delint1  
							
							
							
						 
						
							2021-05-28 13:11:48 +01:00  
				
					
						
							
							
								 
						
							
							
								36e43270ca 
								
									
								
							
								 
							
						 
						
							
							
								
								Apply suggestions from code review  
							
							
							
						 
						
							2021-05-28 13:08:05 +01:00  
				
					
						
							
							
								 
						
							
							
								e41645795c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365  
							
							
							
						 
						
							2021-05-28 13:05:41 +01:00  
				
					
						
							
							
								 
						
							
							
								ea26393709 
								
							
								 
							
						 
						
							
							
								
								Styling amends to accommodate the invite dialog footer  
							
							
							
						 
						
							2021-05-28 13:00:18 +01:00  
				
					
						
							
							
								 
						
							
							
								2c750fcb7a 
								
							
								 
							
						 
						
							
							
								
								Fix overflow issue in suggestion tiles  
							
							
							
						 
						
							2021-05-28 12:48:12 +01:00  
				
					
						
							
							
								 
						
							
							
								1a51ed9ffd 
								
							
								 
							
						 
						
							
							
								
								Make breadcrumb animation run on the compositing layer  
							
							
							
						 
						
							2021-05-28 09:34:08 +01:00