2ebc1252cb 
								
									
								
							
								 
							
						 
						
							
							
								
								Removed unnecessary functions  
							
							... 
							
							
							
							Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com> 
							
						 
						
							2021-02-18 19:54:54 +01:00  
				
					
						
							
							
								 
						
							
							
								fa19adcfe0 
								
							
								 
							
						 
						
							
							
								
								Simplifie  
							
							
							
						 
						
							2020-12-03 11:50:08 +01:00  
				
					
						
							
							
								 
						
							
							
								bab541a652 
								
							
								 
							
						 
						
							
							
								
								Hide spell-check settings if not using Electron  
							
							
							
						 
						
							2020-12-02 20:14:58 +01:00  
				
					
						
							
							
								 
						
							
							
								db5bc0cb7a 
								
							
								 
							
						 
						
							
							
								
								Fix formatting  
							
							
							
						 
						
							2020-12-01 20:36:25 +01:00  
				
					
						
							
							
								 
						
							
							
								3c2bb6e4f6 
								
							
								 
							
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							2020-12-01 20:17:24 +01:00  
				
					
						
							
							
								 
						
							
							
								b207a877eb 
								
							
								 
							
						 
						
							
							
								
								Change label  
							
							
							
						 
						
							2020-12-01 16:59:02 +01:00  
				
					
						
							
							
								 
						
							
							
								ead00dcded 
								
							
								 
							
						 
						
							
							
								
								Set spell-check languages without reloading  
							
							
							
						 
						
							2020-11-29 14:46:09 +01:00  
				
					
						
							
							
								 
						
							
							
								8f40cd39fd 
								
							
								 
							
						 
						
							
							
								
								Added styling  
							
							
							
						 
						
							2020-11-29 12:29:05 +01:00  
				
					
						
							
							
								 
						
							
							
								f0bbed0c44 
								
							
								 
							
						 
						
							
							
								
								Allow default value  
							
							
							
						 
						
							2020-11-29 12:17:07 +01:00  
				
					
						
							
							
								 
						
							
							
								5e4f9907cf 
								
							
								 
							
						 
						
							
							
								
								Added persistance  
							
							
							
						 
						
							2020-11-28 19:39:09 +01:00  
				
					
						
							
							
								 
						
							
							
								2f988bc97f 
								
							
								 
							
						 
						
							
							
								
								Added UI  
							
							
							
						 
						
							2020-11-26 13:51:03 +01: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  
				
					
						
							
							
								 
						
							
							
								598c982f02 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187  
							
							... 
							
							
							
							 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts 
							
						 
						
							2020-09-18 11:14:36 +01:00  
				
					
						
							
							
								 
						
							
							
								c1cf8db78f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts 
							
						 
						
							2020-09-17 13:55:11 +01:00  
				
					
						
							
							
								 
						
							
							
								eda2dee63f 
								
							
								 
							
						 
						
							
							
								
								UI Feature Flag: 3PIDs  
							
							
							
						 
						
							2020-09-17 13:25:18 +01:00  
				
					
						
							
							
								 
						
							
							
								d340dd58d1 
								
							
								 
							
						 
						
							
							
								
								UI Feature Flag: Registration, Password Reset, Deactivate  
							
							
							
						 
						
							2020-09-17 11:55:10 +01:00  
				
					
						
							
							
								 
						
							
							
								d3c84e25f5 
								
							
								 
							
						 
						
							
							
								
								UI Feature Flag: Identity server  
							
							
							
						 
						
							2020-09-16 14:45:34 +01:00  
				
					
						
							
							
								 
						
							
							
								f4f94e31d1 
								
							
								 
							
						 
						
							
							
								
								UI Feature Flag: Disable integrations entry UI  
							
							
							
						 
						
							2020-09-16 11:38:50 +01:00  
				
					
						
							
							
								 
						
							
							
								1f7f40736b 
								
							
								 
							
						 
						
							
							
								
								Fix imports for SettingLevel to point at new file  
							
							
							
						 
						
							2020-07-28 11:53:43 -06:00  
				
					
						
							
							
								 
						
							
							
								6d9d4ee547 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/font-scaling-slider  
							
							
							
						 
						
							2020-05-20 13:46:17 +01:00  
				
					
						
							
							
								 
						
							
							
								798e7a1f86 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/dispatcher-types  
							
							
							
						 
						
							2020-05-15 09:56:02 -06:00  
				
					
						
							
							
								 
						
							
							
								cae28b48d6 
								
							
								 
							
						 
						
							
							
								
								Remove debugging that causes email addresses to load forever  
							
							... 
							
							
							
							This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557  
							
						 
						
							2020-05-14 09:43:34 -06:00  
				
					
						
							
							
								 
						
							
							
								90a898d03f 
								
							
								 
							
						 
						
							
							
								
								Move dispatcher into a subdirectory  
							
							... 
							
							
							
							We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in. 
							
						 
						
							2020-05-13 21:07:50 -06:00  
				
					
						
							
							
								 
						
							
							
								fea219915f 
								
							
								 
							
						 
						
							
							
								
								fix code regeression  
							
							
							
						 
						
							2020-05-13 15:26:11 +01:00  
				
					
						
							
							
								 
						
							
							
								33a5b5142d 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of  https://github.com/matrix-org/matrix-react-sdk  into joriks/font-scaling-slider  
							
							
							
						 
						
							2020-05-07 18:01:20 +01:00  
				
					
						
							
							
								 
						
							
							
								9ae812c346 
								
							
								 
							
						 
						
							
							
								
								Add a loading state for email addresses/phone numbers in settings  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/13432  
							
						 
						
							2020-05-06 15:17:55 -06:00  
				
					
						
							
							
								 
						
							
							
								269621ad24 
								
							
								 
							
						 
						
							
							
								
								Move theme settings to a new tab  
							
							
							
						 
						
							2020-04-23 10:45:47 +01:00  
				
					
						
							
							
								 
						
							
							
								6d0d77f98e 
								
							
								 
							
						 
						
							
							
								
								Disable the linter on lines it complaints about UNSAFE_componentWillMount  
							
							
							
						 
						
							2020-03-31 14:21:12 -06:00  
				
					
						
							
							
								 
						
							
							
								0a6f54da33 
								
							
								 
							
						 
						
							
							
								
								Label and use UNSAFE_componentWillMount to minimize warnings  
							
							... 
							
							
							
							These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.
For https://github.com/vector-im/riot-web/issues/12877 
These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes. 
							
						 
						
							2020-03-31 14:15:23 -06:00  
				
					
						
							
							
								 
						
							
							
								19aae087e0 
								
							
								 
							
						 
						
							
							
								
								Field: make id optional, generate one if not provided  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-29 22:59:15 +01:00  
				
					
						
							
							
								 
						
							
							
								661508ddf8 
								
							
								 
							
						 
						
							
							
								
								Order theme names in the dropdown  
							
							
							
						 
						
							2020-03-06 17:52:16 -07:00  
				
					
						
							
							
								 
						
							
							
								6aeca7b853 
								
							
								 
							
						 
						
							
							
								
								UX polish for custom themes  
							
							
							
						 
						
							2020-03-06 17:43:10 -07:00  
				
					
						
							
							
								 
						
							
							
								8520310e6e 
								
							
								 
							
						 
						
							
							
								
								Proof of concept for custom theme adding  
							
							... 
							
							
							
							For https://github.com/vector-im/riot-web/issues/12517  
							
						 
						
							2020-02-28 11:42:16 -07:00  
				
					
						
							
							
								 
						
							
							
								81ee27f41e 
								
							
								 
							
						 
						
							
							
								
								Replace device with session in UI text  
							
							... 
							
							
							
							This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now. 
							
						 
						
							2020-01-29 15:52:32 +00:00  
				
					
						
							
							
								 
						
							
							
								1394331133 
								
							
								 
							
						 
						
							
							
								
								Fix booleans  
							
							
							
						 
						
							2020-01-23 16:33:33 -07:00  
				
					
						
							
							
								 
						
							
							
								c22bfa84b7 
								
							
								 
							
						 
						
							
							
								
								Hide password section if you can't change your password  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11950  
							
						 
						
							2020-01-23 16:29:55 -07:00  
				
					
						
							
							
								 
						
							
							
								03cb76861f 
								
							
								 
							
						 
						
							
							
								
								Catch exception in checkTerms if no ID server  
							
							... 
							
							
							
							This line will throw if it can't get to the ID server, so move it
inside the catch block too. 
							
						 
						
							2020-01-17 16:26:47 +00:00  
				
					
						
							
							
								 
						
							
							
								042bd35d79 
								
							
								 
							
						 
						
							
							
								
								Fix MatrixClientPeg imports  
							
							
							
						 
						
							2019-12-22 21:15:54 -07:00  
				
					
						
							
							
								 
						
							
							
								d56f0f2a25 
								
							
								 
							
						 
						
							
							
								
								Convert many imports to handle ES6 exports  
							
							... 
							
							
							
							Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761  
							
						 
						
							2019-12-22 21:04:42 -07:00  
				
					
						
							
							
								 
						
							
							
								37ec7e6f7e 
								
							
								 
							
						 
						
							
							
								
								Ensure the settings page accurately represents theme choices  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11518 
This also fixes a bug where the the theme logic can incorrectly get stuck in the light theme - the ThemeController was overriding *all* values, not just supposed themes. Null values aren't overridden so that the various theme logic bits don't assume the user has chosen the light theme explicitly. 
							
						 
						
							2019-11-28 13:40:28 -07:00  
				
					
						
							
							
								 
						
							
							
								a744415221 
								
							
								 
							
						 
						
							
							
								
								Add hack to work around mystery settings bug  
							
							
							
						 
						
							2019-11-20 15:34:32 +00:00  
				
					
						
							
							
								 
						
							
							
								71f5c8b2b0 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							2019-11-20 13:47:54 +00:00  
				
					
						
							
							
								 
						
							
							
								5a700b518a 
								
							
								 
							
						 
						
							
							
								
								Get theme automatically from system setting  
							
							... 
							
							
							
							Uses CSS `prefers-color-scheme` to get the user's preferred colour
scheme. Also bundles up some theme logic into its own class. 
							
						 
						
							2019-11-20 13:41:06 +00:00  
				
					
						
							
							
								 
						
							
							
								a31d222570 
								
							
								 
							
						 
						
							
							
								
								Add catch handler for theme setting  
							
							
							
						 
						
							2019-11-19 23:00:54 +00:00  
				
					
						
							
							
								 
						
							
							
								80ee68a42f 
								
							
								 
							
						 
						
							
							
								
								Use a settings watcher to set the theme  
							
							... 
							
							
							
							Rather than listening for account data updates manually 
							
						 
						
							2019-11-19 22:36:55 +00:00  
				
					
						
							
							
								 
						
							
							
								d7631ed9f8 
								
							
								 
							
						 
						
							
							
								
								Catch errors in Settings when IS is unreachable  
							
							... 
							
							
							
							A few bits of Settings try to talk to the IS when Settings is opened. This
changes them to handle failure by logging warnings to the console. 
							
						 
						
							2019-10-11 15:52:15 +01:00  
				
					
						
							
							
								 
						
							
							
								558f8daeeb 
								
							
								 
							
						 
						
							
							
								
								support custom themes from setting  
							
							... 
							
							
							
							also move theme setting code from MatrixChat to own file. 
							
						 
						
							2019-10-01 15:21:22 +02:00  
				
					
						
							
							
								 
						
							
							
								79d4434c9f 
								
							
								 
							
						 
						
							
							
								
								remove custom color pickers  
							
							
							
						 
						
							2019-10-01 15:20:11 +02:00  
				
					
						
							
							
								 
						
							
							
								8dc94af1ba 
								
							
								 
							
						 
						
							
							
								
								use native color picker instead of library  
							
							
							
						 
						
							2019-09-30 16:54:32 +02:00  
				
					
						
							
							
								 
						
							
							
								cca41c184c 
								
							
								 
							
						 
						
							
							
								
								very basic color pickers for custom theme  
							
							
							
						 
						
							2019-09-26 17:35:06 +02:00