Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								fe4cf9f9b4 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2  
							
							 
							
							
							
						 
						
							2020-06-30 21:16:37 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								2247400010 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4847  from matrix-org/dbkr/recovery_key_upload_2  
							
							 
							
							... 
							
							
							
							Add file upload button to recovery key input 
							
						 
						
							2020-06-30 18:06:12 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
								
								
							
							
								
							
								21c5c745c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4831  from matrix-org/dbkr/recovery_key_passphrase_2  
							
							 
							
							... 
							
							
							
							Implement new design on security setup & login 
							
						 
						
							2020-06-30 17:55:03 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
								
								
							
							
								
							
								446f3e35e9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4846  from matrix-org/t3chguy/notifications0  
							
							 
							
							... 
							
							
							
							Fix Room Custom Sounds regression and make ProgressBar relevant again 
							
						 
						
							2020-06-30 16:56:57 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								1e457994f9 
								
							
								 
							
						 
						
							
							
								
								More padding between header & text in radio button  
							
							 
							
							
							
						 
						
							2020-06-30 11:10:12 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								54419878fa 
								
							
								 
							
						 
						
							
							
								
								Add room notifications context menu and non-default indicator to RoomTile2  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-30 00:16:51 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								adf186f568 
								
							
								 
							
						 
						
							
							
								
								Fix RoomTile2 Context Menu to match Figma  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-29 23:03:44 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								175ade8ac4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/todo-cleanup  
							
							 
							
							
							
						 
						
							2020-06-28 20:04:41 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								ee2c216c4d 
								
							
								 
							
						 
						
							
							
								
								Clean up TODO comments for new room list  
							
							 
							
							... 
							
							
							
							All relevant TODOs should still be present, and reference an issue for easy finding. 
							
						 
						
							2020-06-28 20:03:04 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								753f7aa5b8 
								
							
								 
							
						 
						
							
							
								
								Remove the DM button from new room tiles  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/14221  
							
						 
						
							2020-06-27 22:48:54 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								cf3c914382 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0  
							
							 
							
							
							
						 
						
							2020-06-26 15:35:36 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								15ebaa1470 
								
							
								 
							
						 
						
							
							
								
								Port recovery key upload button to new designs  
							
							 
							
							
							
						 
						
							2020-06-26 15:22:04 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								3abc9d8d56 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/room-list/tag-panel  
							
							 
							
							
							
						 
						
							2020-06-26 07:26:57 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								424443927f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4843  from matrix-org/travis/room-list/user-menu  
							
							 
							
							... 
							
							
							
							Make the whole user row clickable in the new room list 
							
						 
						
							2020-06-26 07:25:50 -06:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								f830a4b7fc 
								
							
								 
							
						 
						
							
							
								
								delint  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-26 14:22:59 +01:00  
						
					 
				
					
						
							
							
								 
								Michael Telatynski
							
						 
						
							 
							
							
							
								
							
								72035c8078 
								
							
								 
							
						 
						
							
							
								
								Make <ProgressBar /> relevant again  
							
							 
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-26 14:19:58 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								f4460ca78f 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2  
							
							 
							
							
							
						 
						
							2020-06-26 13:12:06 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								178cbca934 
								
							
								 
							
						 
						
							
							
								
								Use mask images in key entry dialogs  
							
							 
							
							
							
						 
						
							2020-06-26 12:56:41 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								e18ea55d20 
								
							
								 
							
						 
						
							
							
								
								Convert icons to masks  
							
							 
							
							... 
							
							
							
							so they're a sensible colour in other themes 
							
						 
						
							2020-06-26 12:41:24 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								bf45cb0588 
								
							
								 
							
						 
						
							
							
								
								PR feedback: re-order CSS & add underscore  
							
							 
							
							
							
						 
						
							2020-06-26 11:24:07 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								77b618e4f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into anoa/new_spinner  
							
							 
							
							... 
							
							
							
							* 'develop' of github.com:matrix-org/matrix-react-sdk:
  bandaid
  make js-sdk import happy?
  ts-ignore because something is made of fail
  js-sdk imports suck
  Iterate on the new room list resize handle
  Welcome no longer needs any props
  unexport things which need not exporting
  Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
  Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds
  Fix Welcome.html URLs
  improve typing
  Add account and room-account data hooks
  Create a StaticNotificationState for representative purposes
  Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab 
							
						 
						
							2020-06-26 10:17:26 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								e790a31f09 
								
							
								 
							
						 
						
							
							
								
								Include newline at end of _InlineSpinner.scss  
							
							 
							
							
							
						 
						
							2020-06-26 09:44:47 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								a2e33a2386 
								
							
								 
							
						 
						
							
							
								
								Prevent old InlineSpinner gif from spinning  
							
							 
							
							
							
						 
						
							2020-06-26 09:41:18 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								7ce3cc1db7 
								
							
								 
							
						 
						
							
							
								
								Allow the tag panel to be disabled in the new room list  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/14156  
							
						 
						
							2020-06-25 20:35:40 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								411271422c 
								
							
								 
							
						 
						
							
							
								
								Make the whole UserMenu a button to open the menu  
							
							 
							
							
							
						 
						
							2020-06-25 19:54:17 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								bcfdd4d984 
								
							
								 
							
						 
						
							
							
								
								Move all of the UserMenu into the UserMenu component  
							
							 
							
							
							
						 
						
							2020-06-25 19:38:11 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								dafce40d1b 
								
							
								 
							
						 
						
							
							
								
								Rename UserMenuButton to UserMenu for new scope  
							
							 
							
							
							
						 
						
							2020-06-25 19:29:12 -06:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								87f961df3f 
								
							
								 
							
						 
						
							
							
								
								Put behind a labs flag  
							
							 
							
							
							
						 
						
							2020-06-26 01:22:46 +01:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								6ea5dc7b7c 
								
							
								 
							
						 
						
							
							
								
								Change the look of the spinner  
							
							 
							
							
							
						 
						
							2020-06-26 01:19:38 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								30489ce819 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4840  from matrix-org/travis/room-list/resizer-2  
							
							 
							
							... 
							
							
							
							Iterate on the new room list resize handle 
							
						 
						
							2020-06-25 16:27:39 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								326fa8be7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4837  from matrix-org/travis/room-list/hover-states  
							
							 
							
							... 
							
							
							
							Update sublists for new hover states 
							
						 
						
							2020-06-25 16:05:25 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								555078a993 
								
							
								 
							
						 
						
							
							
								
								Iterate on the new room list resize handle  
							
							 
							
							... 
							
							
							
							Only show shadow when resizing, increase the hit area, and make the handle show up when the list itself is hovered. 
							
						 
						
							2020-06-25 16:03:56 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0cb54ed2a4 
								
							
								 
							
						 
						
							
							
								
								Align the badge count on non-aux lists with other badges  
							
							 
							
							
							
						 
						
							2020-06-25 15:42:44 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								aacedfaf13 
								
							
								 
							
						 
						
							
							
								
								Remove opacity from sublist header text, increase weight  
							
							 
							
							
							
						 
						
							2020-06-25 15:19:03 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								129ff3a6e0 
								
							
								 
							
						 
						
							
							
								
								Match line colour from user menu in sublist menu  
							
							 
							
							
							
						 
						
							2020-06-25 15:17:19 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								7b79dd6be1 
								
							
								 
							
						 
						
							
							
								
								Make the sign out button red  
							
							 
							
							
							
						 
						
							2020-06-25 15:13:28 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								9f5a716cc5 
								
							
								 
							
						 
						
							
							
								
								Adjust padding and margins on user menu  
							
							 
							
							
							
						 
						
							2020-06-25 15:11:04 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								2b58875c7f 
								
							
								 
							
						 
						
							
							
								
								Fix alignment issues with the user menu objects  
							
							 
							
							
							
						 
						
							2020-06-25 15:07:38 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								0af1507eed 
								
							
								 
							
						 
						
							
							
								
								Update sublists for new hover states  
							
							 
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/14135 
Unblocks https://github.com/vector-im/riot-web/issues/14089  
							
						 
						
							2020-06-25 12:11:10 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								5efa5d2c80 
								
							
								 
							
						 
						
							
							
								
								Implement new resize handle for dogfooding  
							
							 
							
							... 
							
							
							
							Smaller handle width, small shadow on the top of the show more button if there's more rooms to be shown. The resize handle also only shows when you're hovering in the area now.
The original design called for the shadow to show up only if the user is cutting a tile or dragging, however that is complicated implementation-wise. For speed and encouraging a dogfooding pattern we're going ahead with this behaviour instead. 
							
						 
						
							2020-06-25 10:08:44 -06:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
								
								
							
							
								
							
								a2d53229ea 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4822  from matrix-org/joriks/appearance-tab-compact-to-advanced  
							
							 
							
							... 
							
							
							
							Move compact modern layout checkbox to 'advanced' 
							
						 
						
							2020-06-25 14:38:18 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								41c59cc75e 
								
							
								 
							
						 
						
							
							
								
								Fix deactivated checked checkbox styling  
							
							 
							
							
							
						 
						
							2020-06-25 14:21:08 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								2b144a846a 
								
							
								 
							
						 
						
							
							
								
								Apply some of the newer styling to passphrase / recovery key entry  
							
							 
							
							
							
						 
						
							2020-06-25 12:44:15 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								291914492f 
								
							
								 
							
						 
						
							
							
								
								Fix icons in the new user menu not showing up  
							
							 
							
							
							
						 
						
							2020-06-24 19:20:43 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								906b72082e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4819  from matrix-org/travis/room-list/icon-masks  
							
							 
							
							... 
							
							
							
							Use theme-capable icons in the user menu 
							
						 
						
							2020-06-24 10:34:29 -06:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								966837232c 
								
							
								 
							
						 
						
							
							
								
								Add header icons & justification  
							
							 
							
							
							
						 
						
							2020-06-24 16:12:46 +01:00  
						
					 
				
					
						
							
							
								 
								Jorik Schellekens
							
						 
						
							 
							
							
							
								
							
								0638b94cc2 
								
							
								 
							
						 
						
							
							
								
								Move compact checkbox  
							
							 
							
							
							
						 
						
							2020-06-24 16:06:50 +01:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								5e07052f9e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4816  from matrix-org/travis/room-list/tweak/sublisting  
							
							 
							
							... 
							
							
							
							Decrease margin between new sublists 
							
						 
						
							2020-06-24 07:05:46 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
								
								
							
							
								
							
								3b24f42def 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4818  from matrix-org/travis/room-list/user-menu-polish  
							
							 
							
							... 
							
							
							
							Update profile information in User Menu and truncate where needed 
							
						 
						
							2020-06-24 07:04:49 -06:00  
						
					 
				
					
						
							
							
								 
								Travis Ralston
							
						 
						
							 
							
							
							
								
							
								256636ccf8 
								
							
								 
							
						 
						
							
							
								
								Use display:block over absolute positioning  
							
							 
							
							
							
						 
						
							2020-06-24 07:04:19 -06:00