ab80ea1c2d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4842  from matrix-org/anoa/new_spinner  
							
							... 
							
							
							
							Add a new spinner design behind a labs flag 
							
						 
						
							2020-06-26 10:37:37 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								113dfc5ed2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4845  from matrix-org/t3chguy/hf1  
							
							... 
							
							
							
							ts-ignore because something is made of fail 
							
						 
						
							2020-06-26 10:10:18 +01:00  
				
					
						
							
							
								 
						
							
							
								e790a31f09 
								
							
								 
							
						 
						
							
							
								
								Include newline at end of _InlineSpinner.scss  
							
							
							
						 
						
							2020-06-26 09:44:47 +01:00  
				
					
						
							
							
								 
						
							
							
								96e4b938b2 
								
							
								 
							
						 
						
							
							
								
								Don't modify the size of the MessagePanel spinner  
							
							
							
						 
						
							2020-06-26 09:42:44 +01:00  
				
					
						
							
							
								 
						
							
							
								a2e33a2386 
								
							
								 
							
						 
						
							
							
								
								Prevent old InlineSpinner gif from spinning  
							
							
							
						 
						
							2020-06-26 09:41:18 +01:00  
				
					
						
							
							
								 
						
							
							
								a905028d3a 
								
							
								 
							
						 
						
							
							
								
								bandaid  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-26 09:37:55 +01:00  
				
					
						
							
							
								 
						
							
							
								274e6f3825 
								
							
								 
							
						 
						
							
							
								
								make js-sdk import happy?  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-26 09:35:29 +01:00  
				
					
						
							
							
								 
						
							
							
								228a6adfdf 
								
							
								 
							
						 
						
							
							
								
								indentation  
							
							
							
						 
						
							2020-06-26 09:27:33 +01:00  
				
					
						
							
							
								 
						
							
							
								9391d151f3 
								
							
								 
							
						 
						
							
							
								
								ts-ignore because something is made of fail  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-26 09:15:02 +01:00  
				
					
						
							
							
								 
						
							
							
								538c853149 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4838  from matrix-org/t3chguy/hf1  
							
							... 
							
							
							
							Fix Welcome.html CAS and SSO URLs not working 
							
						 
						
							2020-06-26 09:09:39 +01:00  
				
					
						
							
							
								 
						
							
							
								b00d822bc0 
								
							
								 
							
						 
						
							
							
								
								Remove alt, use aria-label  
							
							
							
						 
						
							2020-06-26 01:22:49 +01:00  
				
					
						
							
							
								 
						
							
							
								87f961df3f 
								
							
								 
							
						 
						
							
							
								
								Put behind a labs flag  
							
							
							
						 
						
							2020-06-26 01:22:46 +01:00  
				
					
						
							
							
								 
						
							
							
								6ea5dc7b7c 
								
							
								 
							
						 
						
							
							
								
								Change the look of the spinner  
							
							
							
						 
						
							2020-06-26 01:19:38 +01:00  
				
					
						
							
							
								 
						
							
							
								6116cfc2b9 
								
							
								 
							
						 
						
							
							
								
								js-sdk imports suck  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 23:52:32 +01:00  
				
					
						
							
							
								 
						
							
							
								85c5bb3bc3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4835  from matrix-org/t3chguy/notifications0  
							
							... 
							
							
							
							More small tweaks in preparation for Notifications rework 
							
						 
						
							2020-06-25 23:34:28 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0cb54ed2a4 
								
							
								 
							
						 
						
							
							
								
								Align the badge count on non-aux lists with other badges  
							
							
							
						 
						
							2020-06-25 15:42:44 -06:00  
				
					
						
							
							
								 
						
							
							
								bebd0a35af 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4839  from matrix-org/travis/room-list/pixels  
							
							... 
							
							
							
							Tweak parts of the new room list design 
							
						 
						
							2020-06-25 15:37:42 -06:00  
				
					
						
							
							
								 
						
							
							
								aacedfaf13 
								
							
								 
							
						 
						
							
							
								
								Remove opacity from sublist header text, increase weight  
							
							
							
						 
						
							2020-06-25 15:19:03 -06:00  
				
					
						
							
							
								 
						
							
							
								129ff3a6e0 
								
							
								 
							
						 
						
							
							
								
								Match line colour from user menu in sublist menu  
							
							
							
						 
						
							2020-06-25 15:17:19 -06:00  
				
					
						
							
							
								 
						
							
							
								7b79dd6be1 
								
							
								 
							
						 
						
							
							
								
								Make the sign out button red  
							
							
							
						 
						
							2020-06-25 15:13:28 -06:00  
				
					
						
							
							
								 
						
							
							
								9f5a716cc5 
								
							
								 
							
						 
						
							
							
								
								Adjust padding and margins on user menu  
							
							
							
						 
						
							2020-06-25 15:11:04 -06:00  
				
					
						
							
							
								 
						
							
							
								2b58875c7f 
								
							
								 
							
						 
						
							
							
								
								Fix alignment issues with the user menu objects  
							
							
							
						 
						
							2020-06-25 15:07:38 -06:00  
				
					
						
							
							
								 
						
							
							
								29b0505bdb 
								
							
								 
							
						 
						
							
							
								
								Welcome no longer needs any props  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 22:02:39 +01:00  
				
					
						
							
							
								 
						
							
							
								f02c52b758 
								
							
								 
							
						 
						
							
							
								
								unexport things which need not exporting  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 22:01:41 +01:00  
				
					
						
							
							
								 
						
							
							
								c65ccbcacf 
								
							
								 
							
						 
						
							
							
								
								Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 22:00:22 +01:00  
				
					
						
							
							
								 
						
							
							
								1c00ae8dd3 
								
							
								 
							
						 
						
							
							
								
								Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 21:59:46 +01:00  
				
					
						
							
							
								 
						
							
							
								3524d678f7 
								
							
								 
							
						 
						
							
							
								
								Fix Welcome.html URLs  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 21:24:24 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f8bd6c818d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4836  from matrix-org/travis/room-list/resize-handle  
							
							... 
							
							
							
							Implement new resize handle for dogfooding 
							
						 
						
							2020-06-25 10:13:51 -06:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4885615a40 
								
							
								 
							
						 
						
							
							
								
								improve typing  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 16:55:38 +01:00  
				
					
						
							
							
								 
						
							
							
								7da02b7901 
								
							
								 
							
						 
						
							
							
								
								Add account and room-account data hooks  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 16:45:01 +01:00  
				
					
						
							
							
								 
						
							
							
								c920cf784e 
								
							
								 
							
						 
						
							
							
								
								Create a StaticNotificationState for representative purposes  
							
							
							
						 
						
							2020-06-25 16:35:54 +01:00  
				
					
						
							
							
								 
						
							
							
								ed634a2bde 
								
							
								 
							
						 
						
							
							
								
								Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 16:35:40 +01:00  
				
					
						
							
							
								 
						
							
							
								7683f2fe1a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4834  from matrix-org/t3chguy/notifications0  
							
							... 
							
							
							
							Hide app badge count for hidden upgraded rooms (non-highlight) 
							
						 
						
							2020-06-25 15:43:50 +01:00  
				
					
						
							
							
								 
						
							
							
								61618d5162 
								
							
								 
							
						 
						
							
							
								
								tidy up  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 15:02:52 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								41c59cc75e 
								
							
								 
							
						 
						
							
							
								
								Fix deactivated checked checkbox styling  
							
							
							
						 
						
							2020-06-25 14:21:08 +01:00  
				
					
						
							
							
								 
						
							
							
								4d47dcaabd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4825  from matrix-org/travis/room-list/default-lists  
							
							... 
							
							
							
							Allow the user to resize the new sublists to 1 tile 
							
						 
						
							2020-06-25 07:18:26 -06:00  
				
					
						
							
							
								 
						
							
							
								92f0f1a5d8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4832  from matrix-org/travis/react-can-shush  
							
							... 
							
							
							
							Make LoggedInView a real component because it uses shouldComponentUpdate 
							
						 
						
							2020-06-25 07:17:56 -06:00  
				
					
						
							
							
								 
						
							
							
								a3b38a2b5f 
								
							
								 
							
						 
						
							
							
								
								Make LoggedInView a real component because it uses shouldComponentUpdate  
							
							... 
							
							
							
							React demands this. 
							
						 
						
							2020-06-25 07:14:02 -06:00  
				
					
						
							
							
								 
						
							
							
								98fc23acb3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4829  from matrix-org/t3chguy/notifications0  
							
							... 
							
							
							
							Small tweaks in preparation for Notifications rework 
							
						 
						
							2020-06-25 14:11:24 +01:00  
				
					
						
							
							
								 
						
							
							
								8743af56ad 
								
							
								 
							
						 
						
							
							
								
								Bring notification utils into this century to simplify ongoing Notifications work  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 09:00:13 +01:00  
				
					
						
							
							
								 
						
							
							
								d4eebd5202 
								
							
								 
							
						 
						
							
							
								
								Fix alwaysShowBadgeCounts settings defn  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 08:58:54 +01:00  
				
					
						
							
							
								 
						
							
							
								edd09f66d1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0  
							
							
							
						 
						
							2020-06-25 08:45:32 +01:00  
				
					
						
							
							
								 
						
							
							
								dbe575d523 
								
							
								 
							
						 
						
							
							
								
								Remove DEBUG  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-06-25 08:44:24 +01:00