2d46ca1d15 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5243  from matrix-org/travis/workflow/design/sep2120  
							
							... 
							
							
							
							Rework profile area for user and room settings to be more clear 
							
						 
						
							2020-09-24 08:39:01 -06:00  
				
					
						
							
							
								 
						
							
							
								aa0e19daf0 
								
							
								 
							
						 
						
							
							
								
								Make the hover transition a variable  
							
							
							
						 
						
							2020-09-24 08:23:06 -06:00  
				
					
						
							
							
								 
						
							
							
								e658d9619b 
								
							
								 
							
						 
						
							
							
								
								Update styles for new colours  
							
							
							
						 
						
							2020-09-23 12:30:01 -06:00  
				
					
						
							
							
								 
						
							
							
								09dd3cea08 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5225  from matrix-org/travis/ft-sep1620/09-enc-files  
							
							... 
							
							
							
							Add a note to use the desktop builds when seshat isn't available 
							
						 
						
							2020-09-22 10:25:34 -06:00  
				
					
						
							
							
								 
						
							
							
								3e0cbd7bfe 
								
							
								 
							
						 
						
							
							
								
								Appease the linters  
							
							
							
						 
						
							2020-09-21 21:09:46 -06:00  
				
					
						
							
							
								 
						
							
							
								4f983ad9a1 
								
							
								 
							
						 
						
							
							
								
								Rework profile sections of user and room settings  
							
							... 
							
							
							
							Mostly by design request. Some is freehand, to be reviewed. 
							
						 
						
							2020-09-21 21:00:51 -06:00  
				
					
						
							
							
								 
						
							
							
								6fee3d8f4f 
								
							
								 
							
						 
						
							
							
								
								Spread out the general user settings sections like the other tabs  
							
							... 
							
							
							
							By design request. 
							
						 
						
							2020-09-21 18:37:08 -06:00  
				
					
						
							
							
								 
						
							
							
								4ef4e67642 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5229  from matrix-org/travis/workflow/design/sep1720  
							
							... 
							
							
							
							Adjust layout and formatting of notifications / files cards 
							
						 
						
							2020-09-18 11:11:35 -06:00  
				
					
						
							
							
								 
						
							
							
								870c35be6f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/ft-sep1620/09-enc-files  
							
							
							
						 
						
							2020-09-18 10:56:20 -06:00  
				
					
						
							
							
								 
						
							
							
								ec4bf0c057 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5219  from matrix-org/jryans/defer-cross-signing-setup  
							
							... 
							
							
							
							Defer encryption setup until first E2EE room 
							
						 
						
							2020-09-18 10:28:33 +01:00  
				
					
						
							
							
								 
						
							
							
								f5f48cbc21 
								
							
								 
							
						 
						
							
							
								
								Fix indentation  
							
							
							
						 
						
							2020-09-17 10:44:58 -06:00  
				
					
						
							
							
								 
						
							
							
								4657a34bbb 
								
							
								 
							
						 
						
							
							
								
								Document some of the magic values  
							
							
							
						 
						
							2020-09-17 10:44:18 -06:00  
				
					
						
							
							
								 
						
							
							
								14a7b83988 
								
							
								 
							
						 
						
							
							
								
								Don't show a bottom border ahead of the date separator  
							
							
							
						 
						
							2020-09-17 10:40:48 -06:00  
				
					
						
							
							
								 
						
							
							
								24d0950b7e 
								
							
								 
							
						 
						
							
							
								
								Adjust layout and formatting of notifications / file cards  
							
							... 
							
							
							
							This follows some polish time with a designer.
The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely. 
We also spent some time making the notifications panel more legible while we wait for the overhaul to land. 
							
						 
						
							2020-09-17 09:23:06 -06:00  
				
					
						
							
							
								 
						
							
							
								ae44a6d1fa 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180  
							
							... 
							
							
							
							 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts 
							
						 
						
							2020-09-17 13:42:27 +01:00  
				
					
						
							
							
								 
						
							
							
								d340dd58d1 
								
							
								 
							
						 
						
							
							
								
								UI Feature Flag: Registration, Password Reset, Deactivate  
							
							
							
						 
						
							2020-09-17 11:55:10 +01:00  
				
					
						
							
							
								 
						
							
							
								bfbbf44dfc 
								
							
								 
							
						 
						
							
							
								
								Add a note to use the desktop builds when seshat isn't available  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15184 
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896  but does not fix it. 
							
						 
						
							2020-09-16 17:23:37 -06:00  
				
					
						
							
							
								 
						
							
							
								c11abb74e0 
								
							
								 
							
						 
						
							
							
								
								UI Feature Flag: Share dialog QR code and social icons  
							
							
							
						 
						
							2020-09-16 16:06:17 +01:00  
				
					
						
							
							
								 
						
							
							
								7a5b0a964f 
								
							
								 
							
						 
						
							
							
								
								Adjust main encryption toast to reference Secure Backup  
							
							... 
							
							
							
							This adjusts the main toast to focus on Secure Backup as suggested in designs.
Part of https://github.com/vector-im/element-web/issues/13895  
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								26b465f1fd 
								
							
								 
							
						 
						
							
							
								
								Remove room recovery reminder  
							
							... 
							
							
							
							The Secure Backup toast replaces this with better UX.
Part of https://github.com/vector-im/element-web/issues/13895  
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								46f37fb969 
								
							
								 
							
						 
						
							
							
								
								Create cross-signing keys during authentication  
							
							... 
							
							
							
							With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before. 
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								3259ab1f25 
								
							
								 
							
						 
						
							
							
								
								Place cross-signing action buttons on a single row  
							
							... 
							
							
							
							Part of https://github.com/vector-im/element-web/issues/13895  
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								7bd5e3fa31 
								
							
								 
							
						 
						
							
							
								
								Move security-related dialogs to a common directory  
							
							
							
						 
						
							2020-09-16 15:03:06 +01:00  
				
					
						
							
							
								 
						
							
							
								b177843e45 
								
							
								 
							
						 
						
							
							
								
								Remove defunct "always show encryption icons" setting  
							
							... 
							
							
							
							It doesn't do anything in practice.
Fixes https://github.com/vector-im/element-web/issues/8725  
							
						 
						
							2020-09-14 22:03:54 -06:00  
				
					
						
							
							
								 
						
							
							
								77f8c48dc4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5195  from matrix-org/travis/iconography-update  
							
							... 
							
							
							
							Show verification status in the room summary card 
							
						 
						
							2020-09-11 09:12:46 -06:00  
				
					
						
							
							
								 
						
							
							
								d53cbecbb1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5198  from matrix-org/jryans/userinfo-scroll  
							
							... 
							
							
							
							Fix user info scrolling in new card view 
							
						 
						
							2020-09-11 14:52:06 +01:00  
				
					
						
							
							
								 
						
							
							
								e49a657a90 
								
							
								 
							
						 
						
							
							
								
								Fix user info scrolling in new card view  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15148  
							
						 
						
							2020-09-11 11:39:58 +01:00  
				
					
						
							
							
								 
						
							
							
								cd3aa81eed 
								
							
								 
							
						 
						
							
							
								
								Fix sticker picker height  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15152  
							
						 
						
							2020-09-11 11:12:56 +01:00  
				
					
						
							
							
								 
						
							
							
								e7e6bc93ec 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #5182  from matrix-org/jryans/defer-cross-signing-setup  
							
							... 
							
							
							
							Split up cross-signing and secure backup settings 
							
						 
						
							2020-09-11 09:41:40 +01:00  
				
					
						
							
							
								 
						
							
							
								4cb7381d03 
								
							
								 
							
						 
						
							
							
								
								Show verification status in the room summary card  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/element-web/issues/15143 
Colours are the same for both light and dark theme. 
							
						 
						
							2020-09-10 13:53:42 -06:00  
				
					
						
							
							
								 
						
							
							
								050319c0cc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into fix-1px-jump  
							
							
							
						 
						
							2020-09-09 17:37:50 +01:00  
				
					
						
							
							
								 
						
							
							
								0219824d6f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup  
							
							
							
						 
						
							2020-09-09 14:13:23 +01:00  
				
					
						
							
							
								 
						
							
							
								cef533b83e 
								
							
								 
							
						 
						
							
							
								
								Update ellipsis svg  
							
							
							
						 
						
							2020-09-09 13:09:21 +01:00  
				
					
						
							
							
								 
						
							
							
								8d66dce68d 
								
							
								 
							
						 
						
							
							
								
								Update copy and use svg for ellipsis  
							
							
							
						 
						
							2020-09-09 12:50:48 +01:00  
				
					
						
							
							
								 
						
							
							
								c8bc80a3b1 
								
							
								 
							
						 
						
							
							
								
								test with delay  
							
							
							
						 
						
							2020-09-09 10:07:43 +01:00  
				
					
						
							
							
								 
						
							
							
								421af52e76 
								
							
								 
							
						 
						
							
							
								
								Fixed 1px jump upwards on filter room members box  
							
							... 
							
							
							
							Signed-off-by: Nigel Mansell <mansell.nigel@mac.com> 
							
						 
						
							2020-09-08 15:29:16 -04:00  
				
					
						
							
							
								 
						
							
							
								bbe2084f66 
								
							
								 
							
						 
						
							
							
								
								Add independent set up / reset actions in Settings  
							
							... 
							
							
							
							This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.) 
							
						 
						
							2020-09-08 18:01:56 +01:00  
				
					
						
							
							
								 
						
							
							
								596060c506 
								
							
								 
							
						 
						
							
							
								
								fix alignments and iterate PR  
							
							
							
						 
						
							2020-09-08 17:57:08 +01:00  
				
					
						
							
							
								 
						
							
							
								6c7cb473dc 
								
							
								 
							
						 
						
							
							
								
								finalise colours from Figma  
							
							
							
						 
						
							2020-09-08 16:33:26 +01:00  
				
					
						
							
							
								 
						
							
							
								8d14d26e2b 
								
							
								 
							
						 
						
							
							
								
								do the todos  
							
							
							
						 
						
							2020-09-08 16:27:09 +01:00  
				
					
						
							
							
								 
						
							
							
								4a4a8cd611 
								
							
								 
							
						 
						
							
							
								
								styling and fix `i` button behaviour  
							
							
							
						 
						
							2020-09-08 15:43:40 +01:00  
				
					
						
							
							
								 
						
							
							
								3a99343433 
								
							
								 
							
						 
						
							
							
								
								iterate styling  
							
							
							
						 
						
							2020-09-08 15:43:40 +01:00  
				
					
						
							
							
								 
						
							
							
								ef0843d4ad 
								
							
								 
							
						 
						
							
							
								
								Iterate to match design  
							
							
							
						 
						
							2020-09-08 15:43:40 +01:00  
				
					
						
							
							
								 
						
							
							
								0fe6ce1842 
								
							
								 
							
						 
						
							
							
								
								Stage svgs  
							
							
							
						 
						
							2020-09-08 15:43:40 +01:00  
				
					
						
							
							
								 
						
							
							
								98b59fb217 
								
							
								 
							
						 
						
							
							
								
								Consolidate all the work thus far  
							
							
							
						 
						
							2020-09-08 15:43:38 +01:00  
				
					
						
							
							
								 
						
							
							
								31cca5e0f2 
								
							
								 
							
						 
						
							
							
								
								Create new right panel cards  
							
							
							
						 
						
							2020-09-08 15:42:31 +01:00  
				
					
						
							
							
								 
						
							
							
								89a836100d 
								
							
								 
							
						 
						
							
							
								
								small css tweaks to closer match the figma  
							
							
							
						 
						
							2020-09-08 15:42:31 +01:00  
				
					
						
							
							
								 
						
							
							
								2fbb551035 
								
							
								 
							
						 
						
							
							
								
								Put backup details in a table  
							
							
							
						 
						
							2020-09-08 15:26:59 +01:00  
				
					
						
							
							
								 
						
							
							
								667c129ebc 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into t3chguy/dpsah/6785  
							
							... 
							
							
							
							 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js 
							
						 
						
							2020-09-07 14:33:57 +01:00  
				
					
						
							
							
								 
						
							
							
								590e2b70f9 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							
							
						 
						
							2020-09-05 16:51:13 -04:00