88e337b89c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5929  from matrix-org/gsouquet-e2ee-warning  
							
							
							
						 
						
							2021-06-10 14:58:31 +01:00  
				
					
						
							
							
								 
						
							
							
								79b8fbc2a9 
								
									
								
							
								 
							
						 
						
							
							
								
								Add indentation for unencrypted warning text  
							
							... 
							
							
							
							Co-authored-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2021-06-10 14:21:48 +01:00  
				
					
						
							
							
								 
						
							
							
								0a6cd6a758 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6171  from matrix-org/gsouquet/fix-17505  
							
							... 
							
							
							
							Fix expanding last collapsed sticky session when zoomed in 
							
						 
						
							2021-06-10 12:44:57 +01:00  
				
					
						
							
							
								 
						
							
							
								9731e275f8 
								
							
								 
							
						 
						
							
							
								
								cater for an undefined MatrixClient on rooms  
							
							
							
						 
						
							2021-06-10 12:15:55 +01:00  
				
					
						
							
							
								 
						
							
							
								6606a1142d 
								
							
								 
							
						 
						
							
							
								
								Update unencrypted room warning copy  
							
							
							
						 
						
							2021-06-10 11:29:10 +01:00  
				
					
						
							
							
								 
						
							
							
								7f3173f170 
								
							
								 
							
						 
						
							
							
								
								Implement unencrypted warning slate in rooms  
							
							
							
						 
						
							2021-06-10 11:14:43 +01:00  
				
					
						
							
							
								 
						
							
							
								4f649f290c 
								
							
								 
							
						 
						
							
							
								
								Migrate RoomSettingsDialog to TypeScript  
							
							
							
						 
						
							2021-06-10 10:46:54 +01:00  
				
					
						
							
							
								 
						
							
							
								c2d1eb3e8e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet-e2ee-warning  
							
							
							
						 
						
							2021-06-10 10:25:20 +01:00  
				
					
						
							
							
								 
						
							
							
								b4cb275ca1 
								
							
								 
							
						 
						
							
							
								
								Fix expanding last collapsed sticky session when zoomed in  
							
							
							
						 
						
							2021-06-09 17:59:41 +01:00  
				
					
						
							
							
								 
						
							
							
								91a88f25a8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6168  from matrix-org/gsouquet/fix-17586  
							
							... 
							
							
							
							Revert refreshStickyHeaders optimisations 
							
						 
						
							2021-06-09 16:34:11 +01:00  
				
					
						
							
							
								 
						
							
							
								0b90560b1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6170  from matrix-org/dbkr/call_room_logging  
							
							... 
							
							
							
							Add logging for which rooms calls are in 
							
						 
						
							2021-06-09 16:24:12 +01:00  
				
					
						
							
							
								 
						
							
							
								9aaf506ad5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6169  from matrix-org/jryans/rebuild-the-sky  
							
							... 
							
							
							
							Restore read receipt animation from event to event 
							
						 
						
							2021-06-09 16:16:17 +01:00  
				
					
						
							
							
								 
						
							
							
								bd8fd246c6 
								
							
								 
							
						 
						
							
							
								
								Add logging for which rooms calls are in  
							
							
							
						 
						
							2021-06-09 16:04:03 +01:00  
				
					
						
							
							
								 
						
							
							
								c6972c4535 
								
							
								 
							
						 
						
							
							
								
								Fix spelling  
							
							
							
						 
						
							2021-06-09 15:53:38 +01:00  
				
					
						
							
							
								 
						
							
							
								e566704bdf 
								
							
								 
							
						 
						
							
							
								
								Remove redundant early return  
							
							
							
						 
						
							2021-06-09 15:48:30 +01:00  
				
					
						
							
							
								 
						
							
							
								b43315c6c1 
								
							
								 
							
						 
						
							
							
								
								Restore read receipt animation from event to event  
							
							... 
							
							
							
							This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.
Fixes https://github.com/vector-im/element-web/issues/17561  
							
						 
						
							2021-06-09 15:46:10 +01:00  
				
					
						
							
							
								 
						
							
							
								927de02a8e 
								
							
								 
							
						 
						
							
							
								
								Revert refreshStickyHeaders optimisations  
							
							
							
						 
						
							2021-06-09 14:59:55 +01:00  
				
					
						
							
							
								 
						
							
							
								ceed6ecbe8 
								
							
								 
							
						 
						
							
							
								
								Restore Page Up/Down key bindings when focusing the composer  
							
							
							
						 
						
							2021-06-09 14:03:31 +01:00  
				
					
						
							
							
								 
						
							
							
								8334a2ba60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6143  from robintown/hide-events-perf  
							
							
							
						 
						
							2021-06-09 09:13:56 +01:00  
				
					
						
							
							
								 
						
							
							
								a28f5754c7 
								
							
								 
							
						 
						
							
							
								
								Convert TextForEvent to TypeScript  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-08 21:58:48 -04:00  
				
					
						
							
							
								 
						
							
							
								2938bfbadf 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6162  from matrix-org/t3chguy/fix/17596  
							
							... 
							
							
							
							Fix upgrade to element home button in top left menu 
							
						 
						
							2021-06-08 17:48:45 +01:00  
				
					
						
							
							
								 
						
							
							
								90982f9b3f 
								
							
								 
							
						 
						
							
							
								
								Fix upgrade to element home button in top left menu  
							
							
							
						 
						
							2021-06-08 17:31:08 +01:00  
				
					
						
							
							
								 
						
							
							
								34cc494a8e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6140  from matrix-org/t3chguy/fix/17553  
							
							
							
						 
						
							2021-06-08 16:45:35 +01:00  
				
					
						
							
							
								 
						
							
							
								f84ee22769 
								
							
								 
							
						 
						
							
							
								
								Add comment  
							
							
							
						 
						
							2021-06-08 16:36:53 +01:00  
				
					
						
							
							
								 
						
							
							
								399be4fa5d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6161  from matrix-org/dbkr/widget_load_error  
							
							... 
							
							
							
							Better handling for widgets that fail to load 
							
						 
						
							2021-06-08 16:28:44 +01:00  
				
					
						
							
							
								 
						
							
							
								90a58380fd 
								
							
								 
							
						 
						
							
							
								
								Make it translateable  
							
							... 
							
							
							
							And also the other one that I copied from 
							
						 
						
							2021-06-08 16:15:20 +01:00  
				
					
						
							
							
								 
						
							
							
								26a030abcd 
								
							
								 
							
						 
						
							
							
								
								Better handling for widgets that fail to load  
							
							
							
						 
						
							2021-06-08 12:40:38 +01:00  
				
					
						
							
							
								 
						
							
							
								432373a00e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5999  from robintown/improved-forwarding-ui  
							
							
							
						 
						
							2021-06-08 10:52:06 +01:00  
				
					
						
							
							
								 
						
							
							
								b00ad63a35 
								
							
								 
							
						 
						
							
							
								
								Fix whitespace nitpick  
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-07 19:16:00 -04:00  
				
					
						
							
							
								 
						
							
							
								a8dab04d5e 
								
							
								 
							
						 
						
							
							
								
								Remove mystery dot from forward dialog preview  
							
							... 
							
							
							
							It was a bullet point, since EventTiles now get created as li by default
:P
Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-06-07 19:10:45 -04:00  
				
					
						
							
							
								 
						
							
							
								b97867271b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into improved-forwarding-ui  
							
							
							
						 
						
							2021-06-07 19:09:36 -04:00  
				
					
						
							
							
								 
						
							
							
								946416cf87 
								
									
								
							
								 
							
						 
						
							
							
								
								Make serverCandidates optional  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-07 17:09:56 -05:00  
				
					
						
							
							
								 
						
							
							
								9fdbd4c120 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into share-room  
							
							
							
						 
						
							2021-06-07 17:00:44 -05:00  
				
					
						
							
							
								 
						
							
							
								65cc42b555 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6160  from robintown/fix-setting-watchers  
							
							
							
						 
						
							2021-06-07 22:56:39 +01:00  
				
					
						
							
							
								 
						
							
							
								a5bf17ff65 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert incorrect change to forShareableRoom  
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2021-06-07 16:54:41 -05:00  
				
					
						
							
							
								 
						
							
							
								ced6c43147 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6152  from matrix-org/t3chguy/fix/17571  
							
							... 
							
							
							
							Fix Stickerpicker context menu 
							
						 
						
							2021-06-07 22:21:19 +01: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  
				
					
						
							
							
								 
						
							
							
								187a367111 
								
							
								 
							
						 
						
							
							
								
								Add prop to alwaysShowTimestamps on TimelinePanel  
							
							
							
						 
						
							2021-06-07 17:11:14 +01:00  
				
					
						
							
							
								 
						
							
							
								6d80cd5913 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6149  from SimonBrandner/fix/jumps-image-view  
							
							
							
						 
						
							2021-06-07 15:19:45 +01:00  
				
					
						
							
							
								 
						
							
							
								20a3dd67d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Some more styling  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 16:12:06 +02:00  
				
					
						
							
							
								 
						
							
							
								255f996710 
								
									
								
							
								 
							
						 
						
							
							
								
								landscape -> imageIsNotFlipped  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 15:46:03 +02:00  
				
					
						
							
							
								 
						
							
							
								b5d271759f 
								
									
								
							
								 
							
						 
						
							
							
								
								Why would I format this myself if eslint can do it for me?  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 15:43:43 +02:00  
				
					
						
							
							
								 
						
							
							
								2e47a1176f 
								
									
								
							
								 
							
						 
						
							
							
								
								Get rid of weird rotation prop  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 15:39:11 +02:00  
				
					
						
							
							
								 
						
							
							
								0918ebad0a 
								
									
								
							
								 
							
						 
						
							
							
								
								calculateZoomAndRotate -> setZoomAndRotation  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 15:28:37 +02:00  
				
					
						
							
							
								 
						
							
							
								5880cb3b5f 
								
									
								
							
								 
							
						 
						
							
							
								
								Better wording  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-06-07 15:26:54 +02:00  
				
					
						
							
							
								 
						
							
							
								67c9fe1e07 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Update curly braces styling"  
							
							... 
							
							
							
							This reverts commit ba0f6766ca 
							
						 
						
							2021-06-07 15:25:57 +02: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  
				
					
						
							
							
								 
						
							
							
								b60feab7d2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6147  from robintown/easier-image-panning  
							
							
							
						 
						
							2021-06-07 12:47:43 +01:00  
				
					
						
							
							
								 
						
							
							
								a3a6f3fa31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6154  from matrix-org/gsouquet/fix-files-scroll-token  
							
							
							
						 
						
							2021-06-07 12:44:59 +01:00