Commit graph

278 commits

Author SHA1 Message Date
Jorik Schellekens
e5cb149296 Handle fontslider input errors correctly 2020-04-23 13:52:08 +01:00
Jorik Schellekens
c86638c667 add toggle between font slider and custom setting 2020-04-23 12:09:08 +01:00
Jorik Schellekens
8f0d81e770 Linearly interpolate between value intervals. 2020-04-23 10:45:48 +01:00
Jorik Schellekens
fe175bb9a8 Styling for the font slider 2020-04-23 10:45:48 +01:00
Jorik Schellekens
ee33fc1c20 Remove labels 2020-04-23 10:45:48 +01:00
Jorik Schellekens
ba362b727c Use onSelectionChange prop 2020-04-23 10:45:48 +01:00
Jorik Schellekens
315a272cb4 File rename 2020-04-23 10:45:48 +01:00
Jorik Schellekens
4525f71b1c Missed an import 2020-04-23 10:45:47 +01:00
Jorik Schellekens
82974bd98c Space out ternaries
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-23 10:45:47 +01:00
Jorik Schellekens
e254675287 Retain copyright
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-23 10:45:47 +01:00
Jorik Schellekens
abd94a65bd Move compoenets/FontSlider to views/Slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
7c9df04d42 Use "Appearance" instead of "Style" 2020-04-23 10:45:47 +01:00
Jorik Schellekens
f1130ecba1 Linting. Finally set up my linter properly 2020-04-23 10:45:47 +01:00
Jorik Schellekens
8b72756b8d Use the font slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
0faf7b865f Set font option width 2020-04-23 10:45:47 +01:00
Jorik Schellekens
14551b1885 Hide font scaling behind labs 2020-04-23 10:45:47 +01:00
Jorik Schellekens
269621ad24 Move theme settings to a new tab 2020-04-23 10:45:47 +01:00
J. Ryan Stinnett
4a0f228714
Merge pull request #4467 from matrix-org/travis/seshat-enable
Take encrypted message search out of labs
2020-04-23 10:21:58 +01:00
Agusti Bau
2471b3c100
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:22 +02:00
Agusti Bau
5163232081
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:13 +02:00
Travis Ralston
3662c9e1c1 Appease the linter 2020-04-22 11:05:43 -06:00
Travis Ralston
fdcdd2529e Take encrypted message search out of labs
Fixes https://github.com/vector-im/riot-web/issues/13262

This is part of the cross-signing shipping master plan. Known issues relating to this feature are:
* https://github.com/vector-im/riot-web/issues/12896
* https://github.com/vector-im/riot-web/issues/12385
* https://github.com/vector-im/riot-web/issues/11831
* https://github.com/vector-im/riot-web/issues/11155

In theory, these are issues we're comfortable with shipping as we're already enabling it by default. This just makes it easier on everyone by removing the flag (making it still enabled by default).
2020-04-22 10:58:11 -06:00
Agusti Bau
ff3272061c Fixed linter errors
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
cd87124e0f removed console logs
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
08bac716d5 Disabled unignore button when unignoring in process
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
47708ca127 Sync settings ignoredUsers with global state
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
7a42caa326 Fixed Unignore state variable naming missmatch
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Travis Ralston
54f8ba4d80 Remove UI to change the cross-signing setting 2020-04-16 11:15:12 -06:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski
384336e8f1 s/alias/address/ in copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 10:06:57 +01:00
Travis Ralston
07030a9466
Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount 2020-04-01 11:14:19 -06:00
Travis Ralston
6d0d77f98e Disable the linter on lines it complaints about UNSAFE_componentWillMount 2020-03-31 14:21:12 -06:00
Travis Ralston
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
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Michael Telatynski
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
David Baker
25e7bde7bc Add a flag to control whether cross-signing signatures are trusted
Fixes: https://github.com/vector-im/riot-web/issues/12616
2020-03-25 18:38:12 +00:00
Michael Telatynski
cad28c81c0 Add Keyboard shortcuts dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
Travis Ralston
f5f433b347
Merge pull request #4148 from matrix-org/travis/poc/theme-command
Proof of concept for custom theme adding
2020-03-13 09:26:07 -06:00
David Baker
650d3d0e2d Un-linkify version in settings
Probably a bit confusing while our changelogs are mostly in react-sdk,
and ended up linking to version 0.0.0 in nightly builds.
2020-03-09 16:17:25 +00:00
Travis Ralston
661508ddf8 Order theme names in the dropdown 2020-03-06 17:52:16 -07:00
Travis Ralston
6aeca7b853 UX polish for custom themes 2020-03-06 17:43:10 -07:00
Travis Ralston
e9657cea70 Merge branch 'develop' into travis/poc/theme-command 2020-03-05 09:49:32 -07:00
J. Ryan Stinnett
3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link
link to matrix.org/security-disclosure-policy in help screen
2020-03-05 14:47:02 +00:00
Ben Parsons
ce84967225 update Security Disclosure Policy link text 2020-03-05 14:18:12 +00:00
Travis Ralston
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
Ben Parsons
c99db2c385 sanitise quotes 2020-02-27 18:54:11 +00:00
Michael Telatynski
6a66c4162b Space preference sections out more significantly to make the section headers obvious
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:16:27 +00:00
Michael Telatynski
ed650d5b90 Move Room List preferences section to be first
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:07:43 +00:00
Michael Telatynski
3ad8b6e9cc Use RoomList.orderAlphabetically as the inverse of RoomList.orderByRecents for migration
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:05:08 +00:00
Michael Telatynski
a1908a208e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list
 Conflicts:
	src/components/views/rooms/RoomList.js
	src/stores/RoomListStore.js
2020-02-26 23:02:06 +00:00
Ben Parsons
566db6c406 link to matrix.org/security-disclosure-policy in help screen 2020-02-25 17:29:59 +00:00
Michael Telatynski
b2c1242207 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:19:18 +00:00
Michael Telatynski
d783ce86c8 Use noreferrer in addition to noopener for edge case browsers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:14:29 +00:00
Michael Telatynski
a6edc34e97 Iterate things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-19 14:52:00 +00:00
Michael Telatynski
932c9b3106 First attempt alpha room list sorting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-18 14:55:12 +00:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
J. Ryan Stinnett
788cb24093 Add advanced option to keep secret storage in memory for session
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
2020-01-30 14:18:12 +00:00
J. Ryan Stinnett
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
Damir Jelić
e2dd2bd950 Merge branch 'poljar/seshat-ui-pr' into develop 2020-01-27 17:18:17 +01:00
Travis Ralston
1394331133 Fix booleans 2020-01-23 16:33:33 -07:00
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
J. Ryan Stinnett
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
Travis Ralston
853c522467 Enable CIDER composer by default
Also convert the setting to a watched setting to apply in realtime.
2019-10-03 23:20:40 -06:00
David Baker
8e96bad0ce
Merge pull request #3511 from matrix-org/travis/ccar-debug
Add a bit of debugging for where MatrixClient stops
2019-10-03 11:05:03 +01:00
David Baker
ae7ecf7f8f
Merge pull request #3512 from matrix-org/jryans/error-boundary
Add error boundaries to catch rendering errors
2019-10-03 10:49:03 +01:00
Travis Ralston
b94c94db04
Merge pull request #3492 from matrix-org/travis/hide-images
Add an option to hide image previews
2019-10-02 12:46:45 -06:00
J. Ryan Stinnett
0e8dc24c3f Add a basic error boundary for the entire app
This adds a basic error boundary around the entire app to catch errors during
rendering and present the user with the options on how to proceed. This is not
implemented as a modal so that it could be used selectively in portions of the
app as well, such as just the `RoomView`.

Fixes https://github.com/vector-im/riot-web/issues/11009
2019-10-02 17:31:22 +01:00
Travis Ralston
4136e0722d Add a bit of debugging for clear cache & reload button 2019-10-02 09:34:30 -06:00
Travis Ralston
daef5f7574 Move setting to real settings 2019-10-01 09:32:42 -06:00
Bruno Windels
558f8daeeb support custom themes from setting
also move theme setting code from MatrixChat to own file.
2019-10-01 15:21:22 +02:00
Bruno Windels
79d4434c9f remove custom color pickers 2019-10-01 15:20:11 +02:00
Bruno Windels
8dc94af1ba use native color picker instead of library 2019-09-30 16:54:32 +02:00
Travis Ralston
59b29e4a7f Add an option to hide image previews
Applies to images, stickers, and URL previews.

Fixes https://github.com/vector-im/riot-web/issues/10735
2019-09-27 21:08:31 -06:00
Bruno Windels
cca41c184c very basic color pickers for custom theme 2019-09-26 17:35:06 +02:00
J. Ryan Stinnett
99b804d567 Change to separate add and bind to guard 3PID account section
This changes to checking for HS support of separate add and bind when guarding
the 3PID account section.

For older HSes, we in fact always require an IS for add with bind param, so the
previous version of this was incorrect.

Part of https://github.com/vector-im/riot-web/issues/10839
2019-09-18 13:02:52 +01:00
Matthew Hodgson
832123524d make the lifetimes of the RM configurable 2019-09-17 17:34:30 +01:00
J. Ryan Stinnett
db33c138aa Update all 3PID state in Settings when IS changes
This ensures we update all 3PID state (like bind status) whenever the IS
changes.
2019-09-11 16:21:42 +01:00
J. Ryan Stinnett
0b7995dc11 Improve terms handling for 3PID state gathering
This changes the 3PID state gathering (used in Settings) to ignore terms errors
(no modals will be shown) on the assumption that other UX handles this case.
2019-09-11 16:21:42 +01:00
J. Ryan Stinnett
f04c347df7 Lift 3PID state management up to Settings tab
This pulls the 3PID state management in Settings up to a single location so that
the Account and Discovery sections now work from a single list that updates
immediately.

Fixes https://github.com/vector-im/riot-web/issues/10519
2019-09-11 16:21:42 +01:00
Travis Ralston
af35cdc2ea Support sending hidden read receipts
Fixes https://github.com/vector-im/riot-web/issues/2527
2019-09-05 20:30:19 -06:00
Travis Ralston
abbc8ffef0 Adjust copy and include identity server changing when terms are pending
Fixes https://github.com/vector-im/riot-web/issues/10636
Fixes https://github.com/vector-im/riot-web/issues/10635
2019-08-26 11:26:21 -06:00
Travis Ralston
fbb2af00da
Merge pull request #3335 from matrix-org/travis/fix-alignment
Fix alignment of discovery section addresses
2019-08-22 08:35:11 -06:00
Travis Ralston
6449016d4b Fix alignment of discovery section addresses
We target the addresses specifically to avoid crushing the subsection text.
2019-08-21 14:41:25 -06:00
Travis Ralston
54633f3ad4 Remove extraneous logging 2019-08-21 12:57:54 -06:00
Travis Ralston
04bb2ed322
Merge pull request #3327 from matrix-org/travis/discover-terms
Handle terms agreement in Discovery section of user settings
2019-08-21 10:14:45 -06:00
Travis Ralston
5bf0587cc5 Don't double translate labs settings
SettingsStore.getDisplayName() already calls _t() for us.

Fixes https://github.com/vector-im/riot-web/issues/10586
2019-08-21 08:55:19 -06:00
Travis Ralston
2dc28a608f Move URL abbreviation to its own util file 2019-08-21 08:46:10 -06:00
Travis Ralston
c758b5d3f1 We don't use reject 2019-08-21 08:43:42 -06:00
Travis Ralston
3181829532 Use new InlineTermsAgreement component on IS Discovery section
Fixes https://github.com/vector-im/riot-web/issues/10522
2019-08-19 23:00:05 -06:00
David Baker
f7083ac332 Clarify that device names are publicly visible
And also a bunch of other UI fixes in the devices table:
 * It's the devices table, don't need 'device' in all the headers
 * Not really necessary to label checkboxes with 'select'
 * Stop table from moving down when the delete button appears

Fixes https://github.com/vector-im/riot-web/issues/10216
2019-08-19 18:09:37 +01:00
David Baker
c1b72fd346 Allow 3pids to be added with no ID server set
Fixes https://github.com/vector-im/riot-web/issues/10573
2019-08-19 15:17:14 +01:00
J. Ryan Stinnett
07826c5675 Hide 3PID discovery sections when no identity server
This hides the email and phone sections of Discovery in the Settings when there
is no IS, as they can't meaningfully be used.

Part of https://github.com/vector-im/riot-web/issues/10528
2019-08-19 14:03:43 +01:00
J. Ryan Stinnett
1c6312d999 Store ICE fallback permission in device setting
This stores the ICE server fallback permission in a device setting so it is
remembered across sessions.

Part of https://github.com/matrix-org/matrix-react-sdk/pull/3309
2019-08-15 15:04:23 +01:00
Travis Ralston
beb6ec4327 Merge branch 'develop' into travis/integs/account_set 2019-08-14 08:45:01 -06:00
David Baker
7c35107a37 Update 3pids section visibility when id server set / unset 2019-08-13 18:40:27 +01:00
David Baker
e5f913bc11 Merge remote-tracking branch 'origin/develop' into dbkr/change_is 2019-08-13 12:56:58 +01:00
Travis Ralston
03d735f4ed Support changing your integration manager in the UI
Part of https://github.com/vector-im/riot-web/issues/10161
2019-08-12 15:40:50 -06:00
Travis Ralston
e21c12c2c9 Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set 2019-08-12 13:06:36 -06:00
Michael Telatynski
7bdac85a2a Break themes out into a separate file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 14:24:12 +01:00
Michael Telatynski
916af736ad Consolidate Themes into ThemeController. Remove hardcoded themes in view
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:43:34 +01:00
David Baker
c76514fceb Add UI in settings to change ID Server
Just changes the current ID server being used

To come in subsequent PRs:
 * Store this in account data
 * Check for terms or support the proper UI for accepting terms when setting
 * Support disconnecting

Part 1 of https://github.com/vector-im/riot-web/issues/10094
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013
2019-08-09 18:07:58 +01:00