Ajay Bura
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4854a53b74
								
									
								
							
								
							
						 | 
						
							
							
								
								Align room tile info in space hierarchy (#7499)
							
							
							
							
							
						 | 
						
							2022-01-10 13:12:47 +00:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								31ab91359a
								
									
								
							
								
							
						 | 
						
							
							
								
								Fix avatar container overlapping give feedback cta (#7491)
							
							
							
							
							
						 | 
						
							2022-01-10 11:34:42 +00:00 | 
						
					
				
					
						
							
							
								 
								Šimon Brandner
							
						 | 
						
							
							
							
								
								
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								27e16362b6
								
									
								
							
								
							
						 | 
						
							
							
								
								Make join button on space hierarchy action in the background (#7041)
							
							
							
							
							
						 | 
						
							2021-10-27 15:24:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ead2a5152f
								
									
								
							
								
							
						 | 
						
							
							
								
								Add decoration to space hierarchy for tiles which have already been j… (#6969)
							
							
							
							
							
						 | 
						
							2021-10-25 11:40:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Šimon Brandner
							
						 | 
						
							
							
							
								
								
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								85b1f166e8
								
							
								
							
						 | 
						
							
							
								
								post-merge tidy up
							
							
							
							
							
						 | 
						
							2021-08-12 12:03:14 +01: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
							
						 | 
						
							
							
							
							
								
							
								d74e9c4f90
								
							
								
							
						 | 
						
							
							
								
								Remove impossible space hierarchy size string
							
							
							
							
							
						 | 
						
							2021-08-11 16:47:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Michael Telatynski
							
						 | 
						
							
							
							
							
								
							
								259627fba2
								
							
								
							
						 | 
						
							
							
								
								Clean up SpaceHierarchy
							
							
							
							
							
						 | 
						
							2021-07-30 11:01:49 +01:00 |