Šimon Brandner 
							
						 
					 
					
						
						
							
						
						2afee596a9 
					 
					
						
						
							
							$primary-bg-color -> $background  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-12 17:17:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						0414ea27b8 
					 
					
						
						
							
							Iterate PR based on feedback  
						
						 
						
						
						
						
					 
					
						2021-08-12 15:53:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						7ce88c9966 
					 
					
						
						
							
							$toast-bg-color -> $system  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-12 16:20:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaiwanth 
							
						 
					 
					
						
						
							
						
						e88edba650 
					 
					
						
						
							
							Merge branch 'develop' into export-conversations  
						
						 
						
						
						
						
					 
					
						2021-08-12 17:10:13 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						57bf64bd28 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
						
						 
						
						... 
						
						
						
						 Conflicts:
	src/components/views/spaces/SpacePanel.tsx 
						
						
					 
					
						2021-08-12 12:05:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						85b1f166e8 
					 
					
						
						
							
							post-merge tidy up  
						
						 
						
						
						
						
					 
					
						2021-08-12 12:03:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						fbc5729daf 
					 
					
						
						
							
							Merge pull request  #6590  from matrix-org/palid/fix/images-loading-ux  
						
						 
						
						... 
						
						
						
						Make loading encrypted images look snappier 
						
						
					 
					
						2021-08-12 12:55:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						0a209afdc2 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089  
						
						 
						
						... 
						
						
						
						 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json 
						
						
					 
					
						2021-08-12 11:41:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						228d623024 
					 
					
						
						
							
							Merge pull request  #6543  from matrix-org/t3chguy/fix/18092  
						
						 
						
						
						
						
					 
					
						2021-08-12 11:28:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						9d3569a577 
					 
					
						
						
							
							Iterate PR based on feedback  
						
						 
						
						
						
						
					 
					
						2021-08-12 10:58:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						09ffad96ff 
					 
					
						
						
							
							Merge pull request  #6569  from matrix-org/t3chguy/fix/spaces-a11y  
						
						 
						
						
						
						
					 
					
						2021-08-11 23:18:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Travis Ralston 
							
						 
					 
					
						
						
							
						
						2e6da2dc6e 
					 
					
						
						
							
							Merge pull request  #6596  from SimonBrandner/fix/scrollbar-dot/18474  
						
						 
						
						... 
						
						
						
						Remove tiny scrollbar dot from code blocks 
						
						
					 
					
						2021-08-11 13:54:47 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						38dbe89316 
					 
					
						
						
							
							Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
						
						 
						
						... 
						
						
						
						 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json 
						
						
					 
					
						2021-08-11 20:53:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						5f54abc7e5 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
						
						 
						
						
						
						
					 
					
						2021-08-11 20:51:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Baker 
							
						 
					 
					
						
						
							
						
						abba7983ce 
					 
					
						
						
							
							Merge pull request  #6578  from SimonBrandner/task/export-call-view-buttons  
						
						 
						
						... 
						
						
						
						Move Call View Buttons into a separate component 
						
						
					 
					
						2021-08-11 18:09:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Travis Ralston 
							
						 
					 
					
						
						
							
						
						a149108a7d 
					 
					
						
						
							
							Merge pull request  #6353  from SimonBrandner/feature/improved-composer  
						
						 
						
						... 
						
						
						
						Improve handling of pills in the composer 
						
						
					 
					
						2021-08-11 10:55:13 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						5bc165f2ac 
					 
					
						
						
							
							Make scrollbar dot transparent  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-11 18:33:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						d74e9c4f90 
					 
					
						
						
							
							Remove impossible space hierarchy size string  
						
						 
						
						
						
						
					 
					
						2021-08-11 16:47:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						54d85a3864 
					 
					
						
						
							
							Iterate PR based on feedback  
						
						 
						
						
						
						
					 
					
						2021-08-11 16:32:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						be85dcd1bf 
					 
					
						
						
							
							Delabs Spaces, keeping it as a default-on preference for the time being  
						
						 
						
						
						
						
					 
					
						2021-08-11 14:52:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						ef3737d179 
					 
					
						
						
							
							Add full class names to animations.scss  
						
						 
						
						
						
						
					 
					
						2021-08-11 10:52:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						c872609ed3 
					 
					
						
						
							
							Modify encrypted images loading for better UX  
						
						 
						
						... 
						
						
						
						Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query. 
						
						
					 
					
						2021-08-10 19:24:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						f98de18427 
					 
					
						
						
							
							Add blue beta dot to the space panel create button  
						
						 
						
						
						
						
					 
					
						2021-08-10 16:45:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						1272b375d5 
					 
					
						
						
							
							Tweak space panel new/cancel button colouring  
						
						 
						
						
						
						
					 
					
						2021-08-10 16:45:21 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Germain Souquet 
							
						 
					 
					
						
						
							
						
						d971802789 
					 
					
						
						
							
							Create ThreadView phase in RightPanel  
						
						 
						
						
						
						
					 
					
						2021-08-10 14:30:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						77cf5bf613 
					 
					
						
						
							
							Update space create menu copy and add link to community migrator  
						
						 
						
						
						
						
					 
					
						2021-08-10 11:30:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						195b8714fc 
					 
					
						
						
							
							Iterate PR based on feedback  
						
						 
						
						
						
						
					 
					
						2021-08-10 09:55:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						db951b43a3 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092  
						
						 
						
						
						
						
					 
					
						2021-08-10 09:48:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						0f49fe92c6 
					 
					
						
						
							
							iterate spaces treeview stuff  
						
						 
						
						
						
						
					 
					
						2021-08-09 14:01:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaiwanth 
							
						 
					 
					
						
						
							
						
						45ce352d02 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations  
						
						 
						
						
						
						
					 
					
						2021-08-09 10:44:13 +05:30  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						d43eac7722 
					 
					
						
						
							
							Add bubble highlight styling  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-08 15:00:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						d0e76a0ecd 
					 
					
						
						
							
							Use CallViewButtons  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-08 11:20:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						0cad9ed14a 
					 
					
						
						
							
							Add _CallViewButtons.scss  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-08 11:15:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Travis Ralston 
							
						 
					 
					
						
						
							
						
						92a60497d2 
					 
					
						
						
							
							Merge pull request  #6572  from matrix-org/travis/voice-messages/stop-left  
						
						 
						
						... 
						
						
						
						Move stop button to the left of the waveform 
						
						
					 
					
						2021-08-07 09:09:21 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						390a3ebcbd 
					 
					
						
						
							
							Merge pull request  #6579  from SimonBrandner/family-friendly-branch-name  
						
						 
						
						... 
						
						
						
						Fix source picker sizing issues (again) 
						
						
					 
					
						2021-08-07 15:50:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						54b5c8554a 
					 
					
						
						
							
							Fix source picker sizing issues (again)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-07 12:00:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						fe1dfa209a 
					 
					
						
						
							
							rethemendex  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-07 10:13:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						b6f7c4fe95 
					 
					
						
						
							
							Merge pull request  #6475  from matrix-org/jitsi-picture-in-picture  
						
						 
						
						... 
						
						
						
						Refactor Calls components into smaller pieces for future Widgets work 
						
						
					 
					
						2021-08-06 18:03:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Travis Ralston 
							
						 
					 
					
						
						
							
						
						fbe8f04942 
					 
					
						
						
							
							Fix height jump of recording states  
						
						 
						
						... 
						
						
						
						Fixes https://github.com/vector-im/element-web/issues/18431  
						
						
					 
					
						2021-08-06 09:04:36 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Travis Ralston 
							
						 
					 
					
						
						
							
						
						cab4f2e402 
					 
					
						
						
							
							Move stop button to the left of the waveform  
						
						 
						
						... 
						
						
						
						Fixes https://github.com/vector-im/element-web/issues/18416  
						
						
					 
					
						2021-08-06 09:00:18 -06:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						4328083ea7 
					 
					
						
						
							
							Rename css  
						
						 
						
						
						
						
					 
					
						2021-08-06 16:31:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Germain 
							
						 
					 
					
						
						
							
						
						3153e11761 
					 
					
						
						
							
							Merge pull request  #6566  from SimonBrandner/task/export-layout  
						
						 
						
						
						
						
					 
					
						2021-08-06 14:45:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						41475a3b94 
					 
					
						
						
							
							fix keyboard focus issue around the space hierarchy  
						
						 
						
						
						
						
					 
					
						2021-08-06 14:12:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						381108a9c2 
					 
					
						
						
							
							Merge pull request  #6227  from SimonBrandner/feature/copy-version/17603  
						
						 
						
						
						
						
					 
					
						2021-08-06 12:56:38 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						35386078a4 
					 
					
						
						
							
							Post-merge changes  
						
						 
						
						
						
						
					 
					
						2021-08-06 13:25:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dariusz Niemczyk 
							
						 
					 
					
						
						
							
						
						3b002c4c1f 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture  
						
						 
						
						... 
						
						
						
						* origin/develop: (100 commits)
  Add comments to isRegionalIndicator
  Stop voice messages that are playing when starting a recording
  Properly set style attribute on shared usercontent iframe
  Fix in-call context menus when in PiP mode (#6552 )
  Extract tooltipYOffset to a const
  Increase yOffset by 4px away
  i18n
  Post-merge conflict resolution and improve alignment of tooltips
  Fix image & blurhash info when skipping thumbnail due to thresholds
  Skip sending a thumbnail if it is not a sufficient saving over the original
  Null guard space inviter to prevent the app exploding
  Remove seams from pin icon
  Appease Jest
  Fix worklet reference for new webpack pipeline
  i18n
  Update copy
  Fix wrong cursor being used in PiP
  Fix voice feed cut-off
  Use flex-start as it has more universal support
  Wrap cases in {}
  ... 
						
						
					 
					
						2021-08-06 13:25:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						f7818e0169 
					 
					
						
						
							
							iterate PR based on feedback  
						
						 
						
						
						
						
					 
					
						2021-08-06 12:05:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Telatynski 
							
						 
					 
					
						
						
							
						
						64995dfae7 
					 
					
						
						
							
							Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092  
						
						 
						
						
						
						
					 
					
						2021-08-06 11:39:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						6afd75ac3c 
					 
					
						
						
							
							Update/fix licenses  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-06 10:40:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Šimon Brandner 
							
						 
					 
					
						
						
							
						
						25c6b216b0 
					 
					
						
						
							
							Move LayoutSwitcher CSS to a separate file  
						
						 
						
						... 
						
						
						
						Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com > 
						
						
					 
					
						2021-08-06 10:37:42 +02:00