Commit graph

318 commits

Author SHA1 Message Date
Travis Ralston
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
Damir Jelić
4aa0658ac8 SecurityUserSettingsTab: Put the event index settings behind the feature flag. 2020-01-23 13:33:09 +01:00
David Baker
7e52eb9f65 Unused import 2020-01-22 15:16:41 +00:00
David Baker
e3a28e3e44 Remove the react-sdk version
I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time.
2020-01-22 15:05:25 +00:00
Damir Jelić
a2892f5b02 EventIndex: Fix some lint issues. 2020-01-21 16:40:32 +01:00
Damir Jelić
8e26268079 SecurityUserSettingsTab: Rename encrypted search section. 2020-01-21 13:38:20 +01:00
Damir Jelić
908a00a13d EventIndexPanel: Move the panel from the preferences to the security tab. 2020-01-21 10:06:04 +01:00
David Baker
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
Damir Jelić
3b99f7565d PreferencesUserSettingsTab: Move the event index UI into a separate component. 2020-01-17 17:10:59 +01:00
Damir Jelić
3c46a56391 EventIndex: Fix some lint errors. 2020-01-17 14:22:22 +01:00
Damir Jelić
c397de18bd PreferencesUserSettingsTab: Add initial event indexing preferences. 2020-01-17 14:22:22 +01:00
Travis Ralston
dd88809622 Fix imports for help & support tab
This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
2020-01-15 12:02:34 -07:00
Travis Ralston
3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore
Many imports were removed as part of refactoring work, so here we are.
2020-01-09 14:17:33 -07:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 00:15:48 +00:00
Travis Ralston
f1ac3d2f64 Convert imports to ES6 from CommonJS
This is needed because `require()` means something different in webpack - it ends up importing the module as something we didn't expect (and is occasionally async)
2019-12-22 21:16:06 -07:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston
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
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski
0bc02564bc Improve a11y of the unignore button in Settings 2019-12-13 14:31:34 +00:00
J. Ryan Stinnett
fae819dfe5 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-11 10:05:20 +00:00
Travis Ralston
9cae685e22
Merge pull request #3686 from matrix-org/travis/theme-fix
Ensure the settings page accurately represents theme choices
2019-11-29 10:17:55 -07:00
J. Ryan Stinnett
c6e56d98b3 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-11-29 11:31:23 +00:00
J. Ryan Stinnett
c103fe4273 Add cross-signing diagnostic panel
This is not part of any designs, so it may be short-lived, but it's quite handy
for diagnosing issues with cross-signing at least while the feature is in
development.
2019-11-29 11:29:08 +00:00
Aaron Raimist
4c50ac0e56
Improve wording
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-28 22:22:42 -06:00
Travis Ralston
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
Aaron Raimist
98c47265c9
Fix indentation
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-26 15:01:02 -06:00
Aaron Raimist
7905e6cc3b
Add a link to the labs feature documentation
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-11-26 14:31:48 -06:00
Michael Telatynski
d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
David Baker
a744415221 Add hack to work around mystery settings bug 2019-11-20 15:34:32 +00:00
Michael Telatynski
6121420113
Merge branch 'develop' into t3chguy/remove_bluebird 2019-11-20 15:21:23 +00:00
David Baker
71f5c8b2b0 Lint 2019-11-20 13:47:54 +00:00
David Baker
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
David Baker
a31d222570 Add catch handler for theme setting 2019-11-19 23:00:54 +00:00
David Baker
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
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Michael Telatynski
79ebb9091c
Merge branch 'develop' into t3chguy/remove_bluebird_1 2019-11-12 18:16:34 +00:00
Michael Telatynski
f5d467b391 delint 2019-11-12 12:26:07 +00:00
Michael Telatynski
2b34cf4362 Replace Promise.delay with promise utils sleep
(cherry picked from commit 0a21957b2c)
2019-11-12 12:07:56 +00:00
Michael Telatynski
f9d6ed63f0 Revert "Replace Promise.delay with promise utils sleep"
This reverts commit 0a21957b
2019-11-12 11:56:32 +00:00
Michael Telatynski
168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions"
This reverts commit 09a8fec2
2019-11-12 11:56:21 +00:00
Michael Telatynski
09a8fec261 s/.done(/.then(/ since modern es6 track unhandled promise exceptions 2019-11-12 11:51:23 +00:00
Michael Telatynski
0a21957b2c Replace Promise.delay with promise utils sleep 2019-11-12 11:46:58 +00:00
Travis Ralston
3e4a721111 Appease the linter 2019-10-31 16:27:45 -06:00
Travis Ralston
b420fd6758 Add a view rules dialog 2019-10-31 16:00:31 -06:00
Travis Ralston
39b657ce7c Add basic structure for (un)subscribing from lists 2019-10-31 15:54:22 -06:00
Travis Ralston
b93508728a Add personal list management to Mjolnir section 2019-10-31 14:24:51 -06:00
Travis Ralston
23383419e8 Add settings base for Mjolnir rules 2019-10-31 13:20:18 -06:00
Michael Telatynski
fa811f99de Merge hide-to-tray-icon with show-tray-icon 2019-10-30 14:32:27 +00:00
Michael Telatynski
cd37ffcef2 Add ability to hide tray icon on non-Mac (which has no tray icon) 2019-10-29 11:37:41 +00:00