8b59bf3d18 
								
									
								
							
								 
							
						 
						
							
							
								
								$tertiary-fg-color -> $tertiary-content  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-12 17:19:29 +02:00  
				
					
						
							
							
								 
						
							
							
								10bc85724a 
								
									
								
							
								 
							
						 
						
							
							
								
								$secondary-fg-color -> $secondary-content  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-12 17:19:26 +02:00  
				
					
						
							
							
								 
						
							
							
								e5fd19c332 
								
									
								
							
								 
							
						 
						
							
							
								
								$primary-fg-color -> $primary-content  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-12 17:18:18 +02:00  
				
					
						
							
							
								 
						
							
							
								2afee596a9 
								
									
								
							
								 
							
						 
						
							
							
								
								$primary-bg-color -> $background  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-12 17:17:34 +02:00  
				
					
						
							
							
								 
						
							
							
								7ce88c9966 
								
									
								
							
								 
							
						 
						
							
							
								
								$toast-bg-color -> $system  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-12 16:20:30 +02:00  
				
					
						
							
							
								 
						
							
							
								228d623024 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6543  from matrix-org/t3chguy/fix/18092  
							
							
							
						 
						
							2021-08-12 11:28:14 +01:00  
				
					
						
							
							
								 
						
							
							
								9d3569a577 
								
							
								 
							
						 
						
							
							
								
								Iterate PR based on feedback  
							
							
							
						 
						
							2021-08-12 10:58:56 +01:00  
				
					
						
							
							
								 
						
							
							
								0f49fe92c6 
								
							
								 
							
						 
						
							
							
								
								iterate spaces treeview stuff  
							
							
							
						 
						
							2021-08-09 14:01:34 +01:00  
				
					
						
							
							
								 
						
							
							
								41475a3b94 
								
							
								 
							
						 
						
							
							
								
								fix keyboard focus issue around the space hierarchy  
							
							
							
						 
						
							2021-08-06 14:12:55 +01:00  
				
					
						
							
							
								 
						
							
							
								2d3211ccf6 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092  
							
							
							
						 
						
							2021-08-04 12:14:29 +01:00  
				
					
						
							
							
								 
						
							
							
								a6e5112be0 
								
							
								 
							
						 
						
							
							
								
								Offer a way to create a space based on existing community  
							
							
							
						 
						
							2021-08-04 10:37:35 +01: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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7ed5dee74b 
								
									
								
							
								 
							
						 
						
							
							
								
								Make colors a bit clearer  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-26 13:17:06 +02:00  
				
					
						
							
							
								 
						
							
							
								277fdf1711 
								
									
								
							
								 
							
						 
						
							
							
								
								voipcall-plinth-color -> quinary-content-color  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-07-26 12:42:18 +02:00  
				
					
						
							
							
								 
						
							
							
								1ba601ba22 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx 
							
						 
						
							2021-07-23 18:28:21 +01:00  
				
					
						
							
							
								 
						
							
							
								dec2c48155 
								
							
								 
							
						 
						
							
							
								
								remove unused import and revert removing some needed css  
							
							
							
						 
						
							2021-07-23 15:56:00 +01:00  
				
					
						
							
							
								 
						
							
							
								1d1a396c1f 
								
							
								 
							
						 
						
							
							
								
								get rid of spurious hr  
							
							
							
						 
						
							2021-07-23 15:51:59 +01:00  
				
					
						
							
							
								 
						
							
							
								9c7fa71a4a 
								
							
								 
							
						 
						
							
							
								
								Remove spaces beta feedback prompts except a couple more strategic ones  
							
							
							
						 
						
							2021-07-23 15:07:24 +01:00  
				
					
						
							
							
								 
						
							
							
								2b133deb63 
								
							
								 
							
						 
						
							
							
								
								fix scroll behaviour to match that of prior to the spinner fix  
							
							
							
						 
						
							2021-07-23 12:19:54 +01:00  
				
					
						
							
							
								 
						
							
							
								4a4ec596bd 
								
							
								 
							
						 
						
							
							
								
								Fix position of the space hierarchy spinner  
							
							
							
						 
						
							2021-07-23 11:27:00 +01:00  
				
					
						
							
							
								 
						
							
							
								02b08888b5 
								
							
								 
							
						 
						
							
							
								
								Use modern layout in file and notification panel  
							
							
							
						 
						
							2021-07-22 16:00:41 +02:00  
				
					
						
							
							
								 
						
							
							
								097cc858ce 
								
							
								 
							
						 
						
							
							
								
								Remove hover effect from files in the files panel  
							
							
							
						 
						
							2021-07-19 10:07:16 -06:00  
				
					
						
							
							
								 
						
							
							
								f4788a6427 
								
									
								
							
								 
							
						 
						
							
							
								
								Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )  
							
							... 
							
							
							
							Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com> 
							
						 
						
							2021-07-15 09:55:58 +01:00  
				
					
						
							
							
								 
						
							
							
								a22baa1b2b 
								
							
								 
							
						 
						
							
							
								
								move file drop image animation to compositor  
							
							
							
						 
						
							2021-07-02 15:23:27 +01:00  
				
					
						
							
							
								 
						
							
							
								a093ea6357 
								
							
								 
							
						 
						
							
							
								
								Move RightPanel animation to compositor  
							
							
							
						 
						
							2021-07-02 15:23:03 +01:00  
				
					
						
							
							
								 
						
							
							
								fdced3da1b 
								
							
								 
							
						 
						
							
							
								
								Remove reminescent references to the tinter  
							
							
							
						 
						
							2021-06-30 08:09:55 +01:00  
				
					
						
							
							
								 
						
							
							
								4cfdad8aa2 
								
							
								 
							
						 
						
							
							
								
								Add spacing between toast buttons with cross browser support in mind  
							
							
							
						 
						
							2021-06-29 11:59:13 +01:00  
				
					
						
							
							
								 
						
							
							
								1d374f6cbb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731  
							
							
							
						 
						
							2021-06-25 14:50:24 +01:00  
				
					
						
							
							
								 
						
							
							
								2e940b7763 
								
									
								
							
								 
							
						 
						
							
							
								
								Update res/css/structures/_RoomStatusBar.scss  
							
							... 
							
							
							
							Co-authored-by: Germain <germain@souquet.com> 
							
						 
						
							2021-06-25 14:47:17 +01:00  
				
					
						
							
							
								 
						
							
							
								a8e2c1bc2a 
								
									
								
							
								 
							
						 
						
							
							
								
								Move the dial pad button next to Explore button from Create Room context menu  ( #6237 )  
							
							... 
							
							
							
							This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected. 
							
						 
						
							2021-06-25 11:45:15 +01:00  
				
					
						
							
							
								 
						
							
							
								5d93216c94 
								
							
								 
							
						 
						
							
							
								
								Decrease e2e shield fill mask size so that it doesn't overlap  
							
							
							
						 
						
							2021-06-23 16:10:47 +01:00  
				
					
						
							
							
								 
						
							
							
								cdb97d5494 
								
							
								 
							
						 
						
							
							
								
								Fix trashcan.svg by exporting it with its viewbox  
							
							... 
							
							
							
							then fix sizing and alignment of consumers 
							
						 
						
							2021-06-23 12:30:23 +01:00  
				
					
						
							
							
								 
						
							
							
								6e3c647109 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							... 
							
							
							
							 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock 
							
						 
						
							2021-06-22 21:15:53 +01:00  
				
					
						
							
							
								 
						
							
							
								adb42b7927 
								
							
								 
							
						 
						
							
							
								
								Deprecate FormButton to use AccessibleButton everywhere  
							
							
							
						 
						
							2021-06-21 14:16:37 +01:00  
				
					
						
							
							
								 
						
							
							
								f8eea2ae23 
								
							
								 
							
						 
						
							
							
								
								Fix word wrap in space descriptions  
							
							
							
						 
						
							2021-06-14 22:18:02 +01:00  
				
					
						
							
							
								 
						
							
							
								66fce64ee0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282  
							
							... 
							
							
							
							 Conflicts:
	package.json
	yarn.lock 
							
						 
						
							2021-06-14 21:39:06 +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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								93010d34fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/fix/6606  
							
							
							
						 
						
							2021-06-03 19:33:09 +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  
				
					
						
							
							
								 
						
							
							
								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