31ab91359a 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix avatar container overlapping give feedback cta ( #7491 )  
							
							
							
						 
						
							2022-01-10 11:34:42 +00:00  
				
					
						
							
							
								 
						
							
							
								9abb2f5ff4 
								
									
								
							
								 
							
						 
						
							
							
								
								Color cleanup 8 ( #7108 )  
							
							... 
							
							
							
							* $accent-color -> $accent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $notice-primary-color -> $alert
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $notice-primary-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-50pct
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* $warning-color -> $alert
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $accent-darker
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $orange-warning-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $warning-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
* Remove $info-bg-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-11-11 13:37:29 +00:00  
				
					
						
							
							
								 
						
							
							
								0fa9638681 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove outdated Spaces restricted rooms warning ( #6927 )  
							
							
							
						 
						
							2021-10-26 10:01:14 +01:00  
				
					
						
							
							
								 
						
							
							
								9becc392dd 
								
									
								
							
								 
							
						 
						
							
							
								
								For space invite previews, use room summary API to get the right member count ( #6982 )  
							
							
							
						 
						
							2021-10-19 16:17:09 +01:00  
				
					
						
							
							
								 
						
							
							
								0d524ae70b 
								
							
								 
							
						 
						
							
							
								
								Iterate invite your teammates to Space view  
							
							
							
						 
						
							2021-10-11 10:43:37 +01:00  
				
					
						
							
							
								 
						
							
							
								a688e5b8b3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx 
							
						 
						
							2021-09-06 11:41:09 +01:00  
				
					
						
							
							
								 
						
							
							
								b6ea75b681 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into task/colors-2  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-08-24 08:57:12 +02:00  
				
					
						
							
							
								 
						
							
							
								15c731d574 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6507  from matrix-org/t3chguy/fix/18089  
							
							... 
							
							
							
							Allow pagination of the space hierarchy and use new APIs 
							
						 
						
							2021-08-23 15:51:34 -06:00  
				
					
						
							
							
								 
						
							
							
								9a3a5a7e63 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix spaces preview screen  
							
							
							
						 
						
							2021-08-21 10:47:34 +02:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								be85dcd1bf 
								
							
								 
							
						 
						
							
							
								
								Delabs Spaces, keeping it as a default-on preference for the time being  
							
							
							
						 
						
							2021-08-11 14:52:40 +01:00  
				
					
						
							
							
								 
						
							
							
								a6e5112be0 
								
							
								 
							
						 
						
							
							
								
								Offer a way to create a space based on existing community  
							
							
							
						 
						
							2021-08-04 10:37:35 +01:00  
				
					
						
							
							
								 
						
							
							
								9eb0986353 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089  
							
							... 
							
							
							
							 Conflicts:
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-07-30 11:34:52 +01:00  
				
					
						
							
							
								 
						
							
							
								259627fba2 
								
							
								 
							
						 
						
							
							
								
								Clean up SpaceHierarchy  
							
							
							
						 
						
							2021-07-30 11:01:49 +01:00  
				
					
						
							
							
								 
						
							
							
								a5606c72de 
								
							
								 
							
						 
						
							
							
								
								Update feedback prompt to match designs  
							
							
							
						 
						
							2021-07-28 17:56:57 +01: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  
				
					
						
							
							
								 
						
							
							
								f8eea2ae23 
								
							
								 
							
						 
						
							
							
								
								Fix word wrap in space descriptions  
							
							
							
						 
						
							2021-06-14 22:18:02 +01:00  
				
					
						
							
							
								 
						
							
							
								f3aa505673 
								
							
								 
							
						 
						
							
							
								
								Add warning to private space creation flow  
							
							
							
						 
						
							2021-06-07 14:14:31 +01:00  
				
					
						
							
							
								 
						
							
							
								b2f01b8438 
								
							
								 
							
						 
						
							
							
								
								Respect newlines in space topics  
							
							
							
						 
						
							2021-06-01 10:48:53 +01:00  
				
					
						
							
							
								 
						
							
							
								7396ce76e5 
								
							
								 
							
						 
						
							
							
								
								Tweak the feedbacks a tad  
							
							
							
						 
						
							2021-05-11 17:30:33 +01:00  
				
					
						
							
							
								 
						
							
							
								7de626824e 
								
							
								 
							
						 
						
							
							
								
								Sprinkle some more feedback prompts in the spaces beta  
							
							
							
						 
						
							2021-05-11 17:01:31 +01:00  
				
					
						
							
							
								 
						
							
							
								2e19c7fd24 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx 
							
						 
						
							2021-05-11 13:40:28 +01:00  
				
					
						
							
							
								 
						
							
							
								de04d82395 
								
							
								 
							
						 
						
							
							
								
								Switch to using forms for implicit submission  
							
							
							
						 
						
							2021-05-11 10:01:40 +01:00  
				
					
						
							
							
								 
						
							
							
								a8c4aabb52 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-05-07 11:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								237399f13e 
								
							
								 
							
						 
						
							
							
								
								fix button height inconsistency between Chrome & FF  
							
							
							
						 
						
							2021-05-07 11:40:39 +01:00  
				
					
						
							
							
								 
						
							
							
								650933096a 
								
							
								 
							
						 
						
							
							
								
								Iterate Spaces admin UX around room management  
							
							
							
						 
						
							2021-05-05 17:25:29 +01:00  
				
					
						
							
							
								 
						
							
							
								279654cc9e 
								
							
								 
							
						 
						
							
							
								
								Design iterations based on PR feedback  
							
							
							
						 
						
							2021-04-29 16:08:59 +01:00  
				
					
						
							
							
								 
						
							
							
								a4f02937cb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021  
							
							... 
							
							
							
							 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx 
							
						 
						
							2021-04-29 09:52:21 +01:00  
				
					
						
							
							
								 
						
							
							
								1802adb4d2 
								
							
								 
							
						 
						
							
							
								
								Iterate styling and decoration for the beta prompts  
							
							
							
						 
						
							2021-04-28 22:47:08 +01:00  
				
					
						
							
							
								 
						
							
							
								18a01d9271 
								
							
								 
							
						 
						
							
							
								
								Show spaces beta prompt when viewing a space without the beta  
							
							
							
						 
						
							2021-04-28 08:41:31 +01:00  
				
					
						
							
							
								 
						
							
							
								8656212eb9 
								
							
								 
							
						 
						
							
							
								
								Space creation prompt user to add existing rooms instead of creating new ones  
							
							
							
						 
						
							2021-04-26 12:41:04 +01:00  
				
					
						
							
							
								 
						
							
							
								cc5a7671a7 
								
							
								 
							
						 
						
							
							
								
								Keep invite button separate from space info  
							
							... 
							
							
							
							60828913d2 
						
							2021-04-22 11:39:58 -04:00  
				
					
						
							
							
								 
						
							
							
								90cd5d0472 
								
							
								 
							
						 
						
							
							
								
								Remove old redundant hover effect  
							
							
							
						 
						
							2021-04-22 08:18:28 +01:00  
				
					
						
							
							
								 
						
							
							
								60828913d2 
								
							
								 
							
						 
						
							
							
								
								Iterate the spaces face pile design  
							
							
							
						 
						
							2021-04-22 08:13:03 +01:00  
				
					
						
							
							
								 
						
							
							
								af18019314 
								
							
								 
							
						 
						
							
							
								
								Final spaces tweaks for the demo  
							
							
							
						 
						
							2021-03-26 13:46:01 +00:00  
				
					
						
							
							
								 
						
							
							
								eff0e6fcc3 
								
							
								 
							
						 
						
							
							
								
								Add facepile to Space landing page and tweak layout slightly  
							
							
							
						 
						
							2021-03-26 13:11:57 +00:00  
				
					
						
							
							
								 
						
							
							
								8c6d92cc99 
								
							
								 
							
						 
						
							
							
								
								Move space room discovery & management into the space room view  
							
							
							
						 
						
							2021-03-26 09:54:15 +00:00  
				
					
						
							
							
								 
						
							
							
								b6a57f73c6 
								
							
								 
							
						 
						
							
							
								
								Tweak border colours in spaces  
							
							
							
						 
						
							2021-03-25 12:17:39 +00:00  
				
					
						
							
							
								 
						
							
							
								f7a3805eed 
								
							
								 
							
						 
						
							
							
								
								Fix styling inconsistency in space room view  
							
							
							
						 
						
							2021-03-24 14:02:25 +00:00  
				
					
						
							
							
								 
						
							
							
								fb46815b6a 
								
							
								 
							
						 
						
							
							
								
								Spaces move away from Form Buttons  
							
							
							
						 
						
							2021-03-24 13:15:31 +00:00  
				
					
						
							
							
								 
						
							
							
								1fbbb67e74 
								
							
								 
							
						 
						
							
							
								
								Consolidate button styles in Space creation flows  
							
							
							
						 
						
							2021-03-19 13:20:30 +00:00  
				
					
						
							
							
								 
						
							
							
								6d81634eec 
								
							
								 
							
						 
						
							
							
								
								Rebuild space previews with new designs  
							
							
							
						 
						
							2021-03-11 11:49:43 +00:00