d93c220aae 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6898  from oliver-pham/issue-19180  
							
							
							
						 
						
							2021-10-18 08:47:28 +01:00  
				
					
						
							
							
								 
						
							
							
								4fb0d021ae 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6897  from SimonBrandner/task/colors-4  
							
							... 
							
							
							
							Color de-duplication #4  
							
						 
						
							2021-10-15 16:07:07 +01:00  
				
					
						
							
							
								 
						
							
							
								1b7277b8f0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6943  from matrix-org/fayed/emoji-compare-buttons  
							
							... 
							
							
							
							Update the button styling on the emoji comparison dialog during cross-signing 
							
						 
						
							2021-10-15 10:34:25 -04:00  
				
					
						
							
							
								 
						
							
							
								0a6e78fd38 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into task/colors-4  
							
							
							
						 
						
							2021-10-15 16:23:40 +02:00  
				
					
						
							
							
								 
						
							
							
								f8c516d927 
								
									
								
							
								 
							
						 
						
							
							
								
								Add new thread message preview ( #18958 ) ( #6953 )  
							
							... 
							
							
							
							Closes https://github.com/vector-im/element-web/issues/18958  
							
						 
						
							2021-10-15 14:29:17 +01:00  
				
					
						
							
							
								 
						
							
							
								71eeb836d9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into task/colors-4  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-15 15:23:32 +02:00  
				
					
						
							
							
								 
						
							
							
								690893ea6b 
								
							
								 
							
						 
						
							
							
								
								Merge duplicate CSS selectors  
							
							
							
						 
						
							2021-10-15 13:32:39 +01:00  
				
					
						
							
							
								 
						
							
							
								7edec291ac 
								
							
								 
							
						 
						
							
							
								
								Switch DevicesPanel to use table (for screen readers)  
							
							
							
						 
						
							2021-10-15 11:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								562a880c7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Create room threads list view  ( #6904 )  
							
							... 
							
							
							
							Implement https://github.com/vector-im/element-web/issues/18957  following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads
In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements 
							
						 
						
							2021-10-14 15:27:35 +02:00  
				
					
						
							
							
								 
						
							
							
								4118d13846 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6829  from matrix-org/t3chguy/fix/18969  
							
							
							
						 
						
							2021-10-14 09:59:34 +01:00  
				
					
						
							
							
								 
						
							
							
								2a3c483f96 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6919  from matrix-org/t3chguy/fix/19146  
							
							
							
						 
						
							2021-10-14 09:58:19 +01:00  
				
					
						
							
							
								 
						
							
							
								8f10a1d3fb 
								
							
								 
							
						 
						
							
							
								
								Update the button styling on the emoji comparison dialog during cross-signing  
							
							... 
							
							
							
							Signed-off-by: Faye Duxovni <fayed@element.io> 
							
						 
						
							2021-10-14 00:46:15 -04:00  
				
					
						
							
							
								 
						
							
							
								ea7257698c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6934  from matrix-org/travis/labs/polls  
							
							... 
							
							
							
							Add feature flag for polls and placeholder dialog 
							
						 
						
							2021-10-13 11:28:53 -06:00  
				
					
						
							
							
								 
						
							
							
								4e9a20db21 
								
							
								 
							
						 
						
							
							
								
								Move the required CSS for DevicesPanel into its own scss file  
							
							... 
							
							
							
							Signed-off-by: Andy Balaam <andyb@element.io> 
							
						 
						
							2021-10-13 13:55:01 +01:00  
				
					
						
							
							
								 
						
							
							
								71c5b02390 
								
							
								 
							
						 
						
							
							
								
								Add feature flag for polls and placeholder dialog  
							
							... 
							
							
							
							We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted. 
							
						 
						
							2021-10-12 15:13:56 -06:00  
				
					
						
							
							
								 
						
							
							
								4416212d0b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6926  from matrix-org/t3chguy/fix/18231  
							
							
							
						 
						
							2021-10-12 14:03:12 +01:00  
				
					
						
							
							
								 
						
							
							
								d050c00703 
								
							
								 
							
						 
						
							
							
								
								Fix room list skeleton ui for narrow room list  
							
							
							
						 
						
							2021-10-12 10:30:36 +01:00  
				
					
						
							
							
								 
						
							
							
								e54d803343 
								
							
								 
							
						 
						
							
							
								
								Tweak skeleton UI height to be more reasonable  
							
							
							
						 
						
							2021-10-11 10:50:33 +01:00  
				
					
						
							
							
								 
						
							
							
								0d524ae70b 
								
							
								 
							
						 
						
							
							
								
								Iterate invite your teammates to Space view  
							
							
							
						 
						
							2021-10-11 10:43:37 +01:00  
				
					
						
							
							
								 
						
							
							
								436996dc30 
								
									
								
							
								 
							
						 
						
							
							
								
								Prevent backdrop image from being selected  
							
							
							
						 
						
							2021-10-11 02:21:09 +02:00  
				
					
						
							
							
								 
						
							
							
								0fe133c14f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'matrix-org:develop' into issue-19180  
							
							
							
						 
						
							2021-10-10 11:41:21 -04:00  
				
					
						
							
							
								 
						
							
							
								111ae75874 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/right_panel/UserInfo.tsx 
							
						 
						
							2021-10-08 13:00:20 +01:00  
				
					
						
							
							
								 
						
							
							
								e1c1d2dc0f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6840  from wlach/make-placeholder-for-field-grey-no-input  
							
							... 
							
							
							
							Make placeholder more grey when no input 
							
						 
						
							2021-10-08 12:54:57 +01:00  
				
					
						
							
							
								 
						
							
							
								2483f1dc90 
								
							
								 
							
						 
						
							
							
								
								Add progress bar to restricted room upgrade dialog  
							
							
							
						 
						
							2021-10-08 12:20:43 +01:00  
				
					
						
							
							
								 
						
							
							
								822f73edf7 
								
							
								 
							
						 
						
							
							
								
								Remove stale comments in _RoomSublist.scss  
							
							
							
						 
						
							2021-10-07 17:28:37 +01:00  
				
					
						
							
							
								 
						
							
							
								57b919b10a 
								
									
								
							
								 
							
						 
						
							
							
								
								Delete fixed headerContainer height  
							
							... 
							
							
							
							Co-authored-by: Travis Ralston <travisr@matrix.org> 
							
						 
						
							2021-10-07 16:51:39 +01:00  
				
					
						
							
							
								 
						
							
							
								c009d15176 
								
							
								 
							
						 
						
							
							
								
								Allow the header container to collapse on itself when room list not minimised  
							
							
							
						 
						
							2021-10-07 10:57:23 +01:00  
				
					
						
							
							
								 
						
							
							
								1d5a1c7a82 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6887  from matrix-org/t3chguy/fix/19216  
							
							
							
						 
						
							2021-10-06 09:29:25 +01:00  
				
					
						
							
							
								 
						
							
							
								ab835c0e0d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'matrix-org:develop' into issue-19180  
							
							
							
						 
						
							2021-10-05 10:15:11 -04:00  
				
					
						
							
							
								 
						
							
							
								70106f979e 
								
							
								 
							
						 
						
							
							
								
								Fix text overflows button on Home page  
							
							
							
						 
						
							2021-10-05 10:11:25 -04:00  
				
					
						
							
							
								 
						
							
							
								651e943b31 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into fayed/fix-verification-dialog  
							
							
							
						 
						
							2021-10-05 08:48:52 -04:00  
				
					
						
							
							
								 
						
							
							
								9a16b4636f 
								
							
								 
							
						 
						
							
							
								
								Make cross-signing dialog clearer and more context-aware  
							
							... 
							
							
							
							- Don't show loading spinners while waiting for user action
- When checking if there are other devices we can verify against, only
  look for devices that are actually cross-signed.
- Adjust displayed options depending on whether other devices and/or
  recovery keys exist, and add an option to reset cross-signing keys
  if necessary.
- Various minor clarifying adjustments to UI styling/text
Signed-off-by: Faye Duxovni <fayed@element.io> 
							
						 
						
							2021-10-05 00:54:20 -04:00  
				
					
						
							
							
								 
						
							
							
								a076bee764 
								
							
								 
							
						 
						
							
							
								
								Decrease profile button touch target  
							
							
							
						 
						
							2021-10-03 19:51:46 +01:00  
				
					
						
							
							
								 
						
							
							
								14466b1e3b 
								
									
								
							
								 
							
						 
						
							
							
								
								$settings-profile-placeholder-bg-color -> $system  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-01 20:43:46 +02:00  
				
					
						
							
							
								 
						
							
							
								8a9c493f3a 
								
									
								
							
								 
							
						 
						
							
							
								
								Use correct color for a selected room in the  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-10-01 20:40:18 +02:00  
				
					
						
							
							
								 
						
							
							
								17f59131d8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6868  from SimonBrandner/task/colors-3-mk2  
							
							... 
							
							
							
							Color clean-up #3  mk2 
							
						 
						
							2021-10-01 11:04:15 +02:00  
				
					
						
							
							
								 
						
							
							
								1e90043eb3 
								
							
								 
							
						 
						
							
							
								
								Change colour variable for export dialog subheading  
							
							
							
						 
						
							2021-09-30 20:58:03 +05:30  
				
					
						
							
							
								 
						
							
							
								8ac77c498f 
								
							
								 
							
						 
						
							
							
								
								Add progress bar to Community to Space migration tool  
							
							... 
							
							
							
							and invite-one-by-one to workaround Synapse ratelimits 
							
						 
						
							2021-09-30 13:43:59 +01:00  
				
					
						
							
							
								 
						
							
							
								208b914cb0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into export-conversations  
							
							
							
						 
						
							2021-09-29 19:32:05 +05:30  
				
					
						
							
							
								 
						
							
							
								399ceaf002 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6879  from matrix-org/t3chguy/fix/19164  
							
							
							
						 
						
							2021-09-29 10:05:43 +01:00  
				
					
						
							
							
								 
						
							
							
								02c5b7e28d 
								
							
								 
							
						 
						
							
							
								
								Pluck out some more applicable styles  
							
							
							
						 
						
							2021-09-28 16:36:25 +01:00  
				
					
						
							
							
								 
						
							
							
								4335cd03c5 
								
							
								 
							
						 
						
							
							
								
								Pluck out JoinRuleSettings styles so they apply in space settings too  
							
							
							
						 
						
							2021-09-28 16:30:17 +01:00  
				
					
						
							
							
								 
						
							
							
								0f8069ac35 
								
							
								 
							
						 
						
							
							
								
								Switch ConfirmUserActionDialog over to using a Field  
							
							
							
						 
						
							2021-09-28 16:22:27 +01:00  
				
					
						
							
							
								 
						
							
							
								2ac2358d93 
								
							
								 
							
						 
						
							
							
								
								Fix avatar getting chopped off  
							
							
							
						 
						
							2021-09-28 16:22:05 +01:00  
				
					
						
							
							
								 
						
							
							
								207a1143fc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969  
							
							
							
						 
						
							2021-09-28 15:45:09 +01:00  
				
					
						
							
							
								 
						
							
							
								ba8ec1763b 
								
							
								 
							
						 
						
							
							
								
								Fix space panel width mismatch for creation modal shade  
							
							
							
						 
						
							2021-09-28 11:05:03 +01:00  
				
					
						
							
							
								 
						
							
							
								77ad0a9142 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6699  from SimonBrandner/fix/improve-aux-panel/18787  
							
							... 
							
							
							
							Improve AUX panel behaviour 
							
						 
						
							2021-09-27 10:16:05 -06:00  
				
					
						
							
							
								 
						
							
							
								8c9cd0d2f4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #6865  from robintown/cut-off-pills  
							
							
							
						 
						
							2021-09-27 16:39:04 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6d0af83df4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/dialogs/LeaveSpaceDialog.tsx
	src/i18n/strings/en_EN.json 
							
						 
						
							2021-09-27 11:19:49 +01:00