ColonisationCaptain
							
						 
						
							 
							
							
							
								
							
								a076bee764 
								
							
								 
							
						 
						
							
							
								
								Decrease profile button touch target  
							
							 
							
							
							
						 
						
							2021-10-03 19:51:46 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								17f59131d8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6868  from SimonBrandner/task/colors-3-mk2  
							
							 
							
							... 
							
							
							
							Color clean-up #3  mk2 
							
						 
						
							2021-10-01 11:04:15 +02:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								1e90043eb3 
								
							
								 
							
						 
						
							
							
								
								Change colour variable for export dialog subheading  
							
							 
							
							
							
						 
						
							2021-09-30 20:58:03 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								208b914cb0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into export-conversations  
							
							 
							
							
							
						 
						
							2021-09-29 19:32:05 +05:30  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								399ceaf002 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6879  from matrix-org/t3chguy/fix/19164  
							
							 
							
							
							
						 
						
							2021-09-29 10:05:43 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								02c5b7e28d 
								
							
								 
							
						 
						
							
							
								
								Pluck out some more applicable styles  
							
							 
							
							
							
						 
						
							2021-09-28 16:36:25 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								4335cd03c5 
								
							
								 
							
						 
						
							
							
								
								Pluck out JoinRuleSettings styles so they apply in space settings too  
							
							 
							
							
							
						 
						
							2021-09-28 16:30:17 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								ba8ec1763b 
								
							
								 
							
						 
						
							
							
								
								Fix space panel width mismatch for creation modal shade  
							
							 
							
							
							
						 
						
							2021-09-28 11:05:03 +01:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								8c9cd0d2f4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6865  from robintown/cut-off-pills  
							
							 
							
							
							
						 
						
							2021-09-27 16:39:04 +01:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								0cfa2a58c7 
								
									
								
							
								 
							
						 
						
							
							
								
								Add ability to expand and collapse long quoted messages ( #6701 )  
							
							 
							
							... 
							
							
							
							In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.
Fixes https://github.com/vector-im/element-web/issues/18884  
							
						 
						
							2021-09-27 12:20:37 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								71d1196692 
								
									
								
							
								 
							
						 
						
							
							
								
								Get rid of message-body-panel colors  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-09-27 09:04:51 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								02d42244a8 
								
									
								
							
								 
							
						 
						
							
							
								
								$user-tile-hover-bg-color -> $header-panel-bg-color  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-09-27 09:02:09 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								b08e05ebe7 
								
							
								 
							
						 
						
							
							
								
								Fix pills being cut off in message bubble layout  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-26 10:24:46 -04:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								bb7319f632 
								
							
								 
							
						 
						
							
							
								
								move timestamp to the right in thread's context  
							
							 
							
							
							
						 
						
							2021-09-24 11:44:11 +01:00  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								d1e3d35d40 
								
							
								 
							
						 
						
							
							
								
								Change export bundle filename format, light theme for all exports and import jszip after export cta  
							
							 
							
							
							
						 
						
							2021-09-22 22:17:23 +05:30  
						
					 
				
					
						
							
							
								 
								Jaiwanth
							
						 
						
							 
							
							
							
								
							
								94e4fb71c1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop'  into export-conversations  
							
							 
							
							
							
						 
						
							2021-09-22 18:07:01 +05:30  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								dc979a33a1 
								
							
								 
							
						 
						
							
							
								
								Fix spacing for message composer buttons  
							
							 
							
							
							
						 
						
							2021-09-22 11:55:25 +01:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								b2c0f57c4b 
								
									
								
							
								 
							
						 
						
							
							
								
								More prefers-reduced-motion friendliness  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-09-21 17:59:13 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								7022ab4f8a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186  
							
							 
							
							
							
						 
						
							2021-09-21 17:36:26 +02:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								499b470d07 
								
									
								
							
								 
							
						 
						
							
							
								
								Use CSS var in JS  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-09-21 17:36:16 +02:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								e17318a364 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							 
							
							
							
						 
						
							2021-09-16 10:05:20 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								30972c597d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6777  from robintown/room-list-scroll-jumps  
							
							 
							
							... 
							
							
							
							Fix room list scroll jumps 
							
						 
						
							2021-09-14 13:40:20 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								fdb004b4e8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6785  from robintown/message-bubble-misc  
							
							 
							
							... 
							
							
							
							Fix various message bubble alignment issues 
							
						 
						
							2021-09-14 13:26:03 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								c3ad978941 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6795  from robintown/message-bubble-font-size  
							
							 
							
							... 
							
							
							
							Make message bubble font size consistent 
							
						 
						
							2021-09-14 13:25:28 -06:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								9b3da61ae4 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary unset  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-14 12:37:45 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								8824b12064 
								
							
								 
							
						 
						
							
							
								
								Fix alignment of sender name in message bubble replies  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-14 12:35:51 -04:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								8e3be15365 
								
									
								
							
								 
							
						 
						
							
							
								
								Move animations into _animations  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-09-14 18:05:15 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								2c0835ed9b 
								
							
								 
							
						 
						
							
							
								
								Add comments to message bubble magic numbers  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-14 11:27:03 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								35171ccd23 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into message-bubble-misc  
							
							 
							
							
							
						 
						
							2021-09-14 11:00:55 -04:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								42a1048fde 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6794  from matrix-org/palid/fix/18997  
							
							 
							
							... 
							
							
							
							Fix autocomplete not having y-scroll 
							
						 
						
							2021-09-14 14:53:06 +02:00  
						
					 
				
					
						
							
							
								 
								Dariusz Niemczyk
							
						 
						
							 
							
							
								
								
							
							
								
							
								527e1eb462 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix autocomplete not having y-scroll  
							
							 
							
							... 
							
							
							
							After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.
Fix https://github.com/vector-im/element-web/issues/18997  
							
						 
						
							2021-09-14 14:45:47 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								465ce0820d 
								
							
								 
							
						 
						
							
							
								
								Make message bubble font size consistent  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-13 23:32:01 -04:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								8099791b32 
								
							
								 
							
						 
						
							
							
								
								Fix various message bubble alignment issues  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-11 11:43:36 -04:00  
						
					 
				
					
						
							
							
								 
								Šimon Brandner
							
						 
						
							 
							
							
								
								
							
							
								
							
								1a128c3a00 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186  
							
							 
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-09-11 15:32:44 +02:00  
						
					 
				
					
						
							
							
								 
								Eric Eastwood
							
						 
						
							 
							
							
							
								
							
								049040b67d 
								
							
								 
							
						 
						
							
							
								
								Optimize input label transition on focus  
							
							 
							
							... 
							
							
							
							Fix https://github.com/vector-im/element-web/issues/12876  
							
						 
						
							2021-09-11 02:03:55 -05:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								80fd960304 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088  
							
							 
							
							
							
						 
						
							2021-09-10 09:53:04 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Townsend
							
						 
						
							 
							
							
							
								
							
								07eafb9e3d 
								
							
								 
							
						 
						
							
							
								
								Fix room list scroll jumps  
							
							 
							
							... 
							
							
							
							Signed-off-by: Robin Townsend <robin@robin.town> 
							
						 
						
							2021-09-09 20:07:51 -04:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								aa53444267 
								
							
								 
							
						 
						
							
							
								
								Improve narrow composer usability  
							
							 
							
							
							
						 
						
							2021-09-09 13:27:25 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								29b4ba6675 
								
							
								 
							
						 
						
							
							
								
								Use new SCSS vars  
							
							 
							
							
							
						 
						
							2021-09-08 15:30:19 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								bbf66a0011 
								
							
								 
							
						 
						
							
							
								
								Make label clickable on narrow mode context menu  
							
							 
							
							
							
						 
						
							2021-09-07 17:10:09 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								646ef197fe 
								
							
								 
							
						 
						
							
							
								
								Fix PR UI defects  
							
							 
							
							
							
						 
						
							2021-09-07 16:02:26 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								329292eb9b 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Create narrow mode for Composer""  
							
							 
							
							
							
						 
						
							2021-09-06 22:11:35 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								945181fe39 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Create narrow mode for Composer"  
							
							 
							
							
							
						 
						
							2021-09-06 22:08:50 -06:00  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								59de3c96a2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6682  from matrix-org/gsouquet/compact-composer-18533  
							
							 
							
							
							
						 
						
							2021-09-07 05:07:00 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Germain
							
						 
						
							 
							
							
								
								
							
							
								
							
								e7cfa4816e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6582  from SimonBrandner/fix/bubble-highlight/18295  
							
							 
							
							
							
						 
						
							2021-09-06 09:56:16 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								997f43cb82 
								
							
								 
							
						 
						
							
							
								
								Implement new narrow mode UI  
							
							 
							
							
							
						 
						
							2021-09-03 12:03:19 +01:00  
						
					 
				
					
						
							
							
								 
								Germain Souquet
							
						 
						
							 
							
							
							
								
							
								e416952c90 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into gsouquet/compact-composer-18533  
							
							 
							
							
							
						 
						
							2021-09-02 08:31:29 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								f0cf00433b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6702  from nordeck/nic/fix/even-tile-preview  
							
							 
							
							... 
							
							
							
							Replace fake username in EventTilePreview with a proper loading state 
							
						 
						
							2021-09-01 14:28:12 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								34e9443abc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6722  from SimonBrandner/fix/autocomplete-dir  
							
							 
							
							
							
						 
						
							2021-09-01 14:45:30 +01:00