a2f516c461 
								
							
								 
							
						 
						
							
							
								
								Implement the Security & Privacy tab of new room settings  
							
							
							
						 
						
							2019-01-29 14:31:07 -07:00  
				
					
						
							
							
								 
						
							
							
								ad276c1fda 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into travis/rsettings/tab/general  
							
							
							
						 
						
							2019-01-29 09:11:21 -07:00  
				
					
						
							
							
								 
						
							
							
								243feb9b13 
								
							
								 
							
						 
						
							
							
								
								Early tab structure and profile changes (name/avatar/topic)  
							
							
							
						 
						
							2019-01-28 13:54:56 -07:00  
				
					
						
							
							
								 
						
							
							
								b7d0dd4408 
								
							
								 
							
						 
						
							
							
								
								Rename GeneralSettingsTab to GeneralUserSettingsTab  
							
							
							
						 
						
							2019-01-28 13:54:56 -07:00  
				
					
						
							
							
								 
						
							
							
								0bee324e48 
								
							
								 
							
						 
						
							
							
								
								Add server type selector component  
							
							
							
						 
						
							2019-01-28 08:52:20 -06:00  
				
					
						
							
							
								 
						
							
							
								b4f02844a8 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into dbkr/sas  
							
							
							
						 
						
							2019-01-28 09:36:39 +00:00  
				
					
						
							
							
								 
						
							
							
								535d42684f 
								
							
								 
							
						 
						
							
							
								
								Initial structure for new room settings  
							
							
							
						 
						
							2019-01-25 13:09:44 -07:00  
				
					
						
							
							
								 
						
							
							
								f7f23e4dea 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into travis/usettings/tab/security  
							
							
							
						 
						
							2019-01-25 09:12:07 -07:00  
				
					
						
							
							
								 
						
							
							
								3301c35f7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2501  from matrix-org/travis/settings/dialog-size  
							
							... 
							
							
							
							Have the settings dialog be fixed in size 
							
						 
						
							2019-01-25 07:46:36 -07:00  
				
					
						
							
							
								 
						
							
							
								5dc75e2d3c 
								
							
								 
							
						 
						
							
							
								
								Have the settings dialog be fixed in size  
							
							... 
							
							
							
							This also brings out some classes that aren't solely applicable to the user settings and will be applicable to the room settings as well. 
							
						 
						
							2019-01-24 19:12:09 -07:00  
				
					
						
							
							
								 
						
							
							
								1f10cda5e4 
								
							
								 
							
						 
						
							
							
								
								Implement the "Help & About" tab of new user settings  
							
							
							
						 
						
							2019-01-24 17:10:35 -07:00  
				
					
						
							
							
								 
						
							
							
								b0a8cbf75f 
								
							
								 
							
						 
						
							
							
								
								Implement the "Security & Privacy" tab of new user settings  
							
							
							
						 
						
							2019-01-24 15:47:04 -07:00  
				
					
						
							
							
								 
						
							
							
								27ee6625ee 
								
							
								 
							
						 
						
							
							
								
								Implement the "Voice & Video" tab of new user settings  
							
							
							
						 
						
							2019-01-24 13:33:22 -07:00  
				
					
						
							
							
								 
						
							
							
								5479a4dac5 
								
							
								 
							
						 
						
							
							
								
								Implement the "Preferences" tab on new user settings  
							
							
							
						 
						
							2019-01-24 10:32:29 -07:00  
				
					
						
							
							
								 
						
							
							
								2a9f6186d7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2491  from matrix-org/travis/usettings/tab/general  
							
							... 
							
							
							
							Implement the "General" tab of new user settings 
							
						 
						
							2019-01-24 08:51:11 -07:00  
				
					
						
							
							
								 
						
							
							
								3f897468a6 
								
							
								 
							
						 
						
							
							
								
								Add a ToggleSwitch and use it for SettingsFlag  
							
							... 
							
							
							
							Also bring in the compact timeline option.
Without minor CSS changes, the old user settings are completely unusable with this change. As such, minimal effort has been put in to have it be useful. Similarly, the changes drop the use of radio groups and the old theme selector was the only one that used it. See the comments for more details on how/why this was mitigated the way it was. 
							
						 
						
							2019-01-23 15:50:41 -07:00  
				
					
						
							
							
								 
						
							
							
								9f5f552be1 
								
							
								 
							
						 
						
							
							
								
								Move LanguageSelector to views  
							
							... 
							
							
							
							It's too simple to be called a structure. 
							
						 
						
							2019-01-23 16:14:03 -06:00  
				
					
						
							
							
								 
						
							
							
								d55d145223 
								
							
								 
							
						 
						
							
							
								
								Bring over phone number management  
							
							
							
						 
						
							2019-01-23 14:16:18 -07:00  
				
					
						
							
							
								 
						
							
							
								6a90625d36 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into dbkr/sas  
							
							
							
						 
						
							2019-01-23 17:32:18 +00:00  
				
					
						
							
							
								 
						
							
							
								aa7afe819f 
								
							
								 
							
						 
						
							
							
								
								Bring over email address management  
							
							
							
						 
						
							2019-01-23 09:28:53 -07:00  
				
					
						
							
							
								 
						
							
							
								fa1ce61a06 
								
							
								 
							
						 
						
							
							
								
								Move profile settings to a dedicated component  
							
							... 
							
							
							
							The tab component is getting a bit hard to navigate 
							
						 
						
							2019-01-23 09:28:53 -07:00  
				
					
						
							
							
								 
						
							
							
								05254f0e82 
								
							
								 
							
						 
						
							
							
								
								Tweak language selector to match design  
							
							
							
						 
						
							2019-01-23 10:18:06 -06:00  
				
					
						
							
							
								 
						
							
							
								94b1d739fb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2476  from matrix-org/travis/modal-tab-settings  
							
							... 
							
							
							
							Basic structure for tabbed user settings 
							
						 
						
							2019-01-23 07:52:44 -07:00  
				
					
						
							
							
								 
						
							
							
								0f3ee9c786 
								
							
								 
							
						 
						
							
							
								
								Extract auth header logo to new component  
							
							... 
							
							
							
							This will allow `riot-web` to replace only the logo, rather than the whole
header. 
							
						 
						
							2019-01-22 22:41:10 -06:00  
				
					
						
							
							
								 
						
							
							
								575cd1e37b 
								
							
								 
							
						 
						
							
							
								
								Add modal look to authentication flows  
							
							... 
							
							
							
							This changes the auth screens to use the modal-like style of the redesign.
This does not attempt to style the actual body content of each screen.  Instead,
it covers the header area with logo, footer links, and overall modal container
only. 
							
						 
						
							2019-01-22 20:44:49 -06:00  
				
					
						
							
							
								 
						
							
							
								5dd5f4f1dc 
								
							
								 
							
						 
						
							
							
								
								add JumpToBottomButtom component  
							
							
							
						 
						
							2019-01-22 14:49:04 +01:00  
				
					
						
							
							
								 
						
							
							
								3bd765f63f 
								
							
								 
							
						 
						
							
							
								
								Rename LoginPage, Header, Footer views to Auth*  
							
							
							
						 
						
							2019-01-21 19:11:43 -06:00  
				
					
						
							
							
								 
						
							
							
								c7354f483b 
								
							
								 
							
						 
						
							
							
								
								Rename LoginBox to AuthButtons  
							
							... 
							
							
							
							This component displays login and register buttons. It's currently used in the
composer when viewing a room as a guest.
The name is confusing because the login flow uses are very similarly named
`mx_Login_box` as a wrapping around forms, which is totally different than these
buttons.
Additionally, the components is moved to `views/auth` since it is very simple
and auth related. 
							
						 
						
							2019-01-21 19:11:43 -06:00  
				
					
						
							
							
								 
						
							
							
								f1e44757f0 
								
							
								 
							
						 
						
							
							
								
								Very early work on the "General" tab  
							
							
							
						 
						
							2019-01-21 16:51:43 -07:00  
				
					
						
							
							
								 
						
							
							
								a7e3d7df28 
								
							
								 
							
						 
						
							
							
								
								Make the tabs look like the design  
							
							
							
						 
						
							2019-01-21 16:51:43 -07:00  
				
					
						
							
							
								 
						
							
							
								5adfc09237 
								
							
								 
							
						 
						
							
							
								
								Bring in TabbedView nearly verbatim from prior work  
							
							... 
							
							
							
							Sourced from https://github.com/matrix-org/matrix-react-sdk/pull/1644  and related PRs. 
							
						 
						
							2019-01-21 16:51:43 -07:00  
				
					
						
							
							
								 
						
							
							
								29be3ee4b5 
								
							
								 
							
						 
						
							
							
								
								Rename login directory to auth  
							
							
							
						 
						
							2019-01-21 17:45:55 -06:00  
				
					
						
							
							
								 
						
							
							
								efd5405267 
								
							
								 
							
						 
						
							
							
								
								Add a form field component for the redesign  
							
							... 
							
							
							
							The label moves into the border on focus and after being filled. A valid color
is applied to the label and input border. Other states like invalid can be added
later as needed.
Adapted from @ara4n's experiment into a React component with a CSS only
approach. 
							
						 
						
							2019-01-19 22:13:53 -06:00  
				
					
						
							
							
								 
						
							
							
								970880737e 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into dbkr/sas  
							
							
							
						 
						
							2019-01-18 18:33:11 +00:00  
				
					
						
							
							
								 
						
							
							
								ec2d51cbbb 
								
							
								 
							
						 
						
							
							
								
								SAS verification screen matching design  
							
							
							
						 
						
							2019-01-18 16:56:49 +00:00  
				
					
						
							
							
								 
						
							
							
								8c30d05eb8 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2348  from matrix-org/bwindels/roomgridview-experimental"  
							
							... 
							
							
							
							This reverts commit ece5cb1fcc64a3d2521c 
							
						 
						
							2019-01-17 10:29:37 +01:00  
				
					
						
							
							
								 
						
							
							
								35af3fc6f7 
								
							
								 
							
						 
						
							
							
								
								Add separate dialog for recovery method removed  
							
							... 
							
							
							
							The "New Recovery Method" dialog would show if either the recovery method had
been changed or removed, but the dialog text didn't make much sense for the
removed case.
This adds a separate dialog customized for the removed case.
Fixes https://github.com/vector-im/riot-web/issues/8046 . 
							
						 
						
							2019-01-10 15:18:57 -06:00  
				
					
						
							
							
								 
						
							
							
								cbf9ff6aee 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters  
							
							
							
						 
						
							2019-01-10 16:56:47 +00:00  
				
					
						
							
							
								 
						
							
							
								712241d710 
								
							
								 
							
						 
						
							
							
								
								Add simple state counters to room heading  
							
							
							
						 
						
							2019-01-07 13:52:13 +00:00  
				
					
						
							
							
								 
						
							
							
								290dc9d8fb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'experimental' into bwindels/roomgridview-experimental  
							
							
							
						 
						
							2019-01-07 14:17:57 +01:00  
				
					
						
							
							
								 
						
							
							
								8017f0a4a1 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real  
							
							
							
						 
						
							2019-01-03 16:00:23 -07:00  
				
					
						
							
							
								 
						
							
							
								f928be6f59 
								
							
								 
							
						 
						
							
							
								
								Revert "Merge pull request  #2395  from matrix-org/dbkr/merge_develop_experimental"  
							
							... 
							
							
							
							This reverts commit ad47144355 
							
						 
						
							2019-01-03 15:37:03 -07:00  
				
					
						
							
							
								 
						
							
							
								7d161de35b 
								
							
								 
							
						 
						
							
							
								
								Partial merge of develop to experimental  
							
							... 
							
							
							
							Does not include #2336  as the file has been moved out from underneath it:
will do this separately 
							
						 
						
							2019-01-03 15:02:58 +00:00  
				
					
						
							
							
								 
						
							
							
								2e1e536d5c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2347  from matrix-org/travis/custom-status  
							
							... 
							
							
							
							Custom status messages 
							
						 
						
							2018-12-19 11:11:15 -07:00  
				
					
						
							
							
								 
						
							
							
								a22a9492a0 
								
							
								 
							
						 
						
							
							
								
								Remove duplicate CSS file for CreateKeyBackupDialog  
							
							... 
							
							
							
							Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-19 17:46:37 +00:00  
				
					
						
							
							
								 
						
							
							
								a1347add95 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/custom-status  
							
							
							
						 
						
							2018-12-19 10:33:34 -07:00  
				
					
						
							
							
								 
						
							
							
								acc2e98355 
								
							
								 
							
						 
						
							
							
								
								Add New Recovery Method dialog  
							
							... 
							
							
							
							Adds a New Recovery Method dialog which is shown when key backup fails because
of a version mismatch / version not found error.
The set up button in the dialog currently only marks a device as verified (via a
verification prompt) instead of the eventual restore and cross-sign flow, since
those pieces don't exist yet.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2018-12-18 10:20:12 +00:00  
				
					
						
							
							
								 
						
							
							
								d4748c91df 
								
							
								 
							
						 
						
							
							
								
								add first draft of RoomGridView  
							
							
							
						 
						
							2018-12-13 13:01:59 +01:00  
				
					
						
							
							
								 
						
							
							
								b0b7932f5f 
								
							
								 
							
						 
						
							
							
								
								Move status context menu to its own component  
							
							... 
							
							
							
							This fixes a lot of the state bugs such as buttons not updating, etc. 
This commit also adds the border around the avatar to indicate a status is set. 
							
						 
						
							2018-12-12 22:26:39 -07:00  
				
					
						
							
							
								 
						
							
							
								a91963e5ee 
								
							
								 
							
						 
						
							
							
								
								Replace the avatar next to the composer with a status entry menu  
							
							... 
							
							
							
							The checkmark might change, and there appears to be some state tracking mishaps that need to be worked out.
Part of https://github.com/vector-im/riot-web/issues/1528  
							
						 
						
							2018-12-12 18:03:30 -07:00