mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 23:22:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
21697 commits 219 branches 562 tags 474 MiB
Commit graph

631 commits

Author SHA1 Message Date
J. Ryan Stinnett
e947a68e13 Remove temporary key backup button 
This removes the temporary extra key backup setup button in Settings used for
testing with and without cross-signing. With this change, there's only one
button and the path you take is determined by the labs flag.

Fixes https://github.com/vector-im/riot-web/issues/11890
 2020-01-20 20:21:03 +00:00
Damir Jelić
8de149704e EventIndexPanel: Dynamically update the indexer stats. 2020-01-20 17:43:55 +01:00
Damir Jelić
1b9b30d4ea EventIndexPanel: Get more stats for our indexer, not just the size. 2020-01-20 17:42:24 +01:00
J. Ryan Stinnett
86a0a2e806
Merge pull request #3864 from matrix-org/jryans/complete-sec-confused 
Adjust secret storage to work before sync
 2020-01-20 11:31:01 +00:00
J. Ryan Stinnett
4a82e86859 Adjust secret storage to work before sync 
This adjusts to changed JS SDK APIs that allow secret storage to optionally ask
the server for any account data needed at login.

Fixes https://github.com/vector-im/riot-web/issues/11901
 2020-01-17 17:59:12 +00: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ć
695b8aff5b EventIndexPanel: Reword the enable/disable setting. 2020-01-17 17:14:55 +01: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
Michael Telatynski
9877fd9e85
Fix Array.concat undefined 2020-01-17 10:04:38 +00: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
135c84251c Fix more imports post-merge 2020-01-09 14:19:19 -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
245a68b3ba Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody 
 Conflicts:
	yarn.lock
 2020-01-09 12:17:21 +00:00
Travis Ralston
59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export 
Convert CommonJS exports to ES6 exports
 2020-01-08 09:09:11 -07:00
Michael Telatynski
f1de6d060a Add a regression test for editing events and url previews 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 14:38:21 +00:00
Michael Telatynski
4c40266938
Merge pull request #3803 from matrix-org/t3chguy/fix_avatar_remove 
Fix ability to remove avatars
 2020-01-06 13:10:13 +00:00
Michael Telatynski
d5eb4ff310
Update src/components/views/settings/ProfileSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-06 13:02:32 +00: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
781b69f4e3
Merge pull request #3693 from matrix-org/hs/bridge-info 
Bridge info settings tab
 2020-01-05 17:03:15 -07:00
Will Hunt
7f0ed05ee1
Update BridgeSettingsTab.js 2020-01-05 23:32:49 +00:00
Will Hunt
2ccc8caa69
Fix indent 2020-01-05 15:50:06 +00:00
Michael Telatynski
295dcbfe48 Fix ability to remove avatars 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-04 13:34:05 +00:00
J. Ryan Stinnett
76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s 
Update key backup creation and recovery paths for SSSS
 2020-01-03 16:32:02 +00:00
J. Ryan Stinnett
e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
J. Ryan Stinnett
b8683462e8 Update backup creation paths for SSSS 
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
 2020-01-03 15:34:05 +00:00
Half-Shot
50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot
668479d94a Tweak as per git review 2020-01-03 13:57:59 +00:00
David Baker
43e4f2dcc0 Use deviceTrust when displaying key backup trust status 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
 2020-01-03 13:34:43 +00:00
J. Ryan Stinnett
99559c5121 Update backup restore paths for SSSS 
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
 2020-01-03 13:33:36 +00:00
Will Hunt
0a8cc416bf
Merge branch 'develop' into hs/bridge-info 2019-12-30 17:09:05 +01: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
806d728d59 Import from the js-sdk's src/ directory 
Because ES6 and such.
 2019-12-22 21:14:33 -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
Travis Ralston
344dac4fb9 Convert CommonJS exports to ES6-compatible exports 
We use `export default` begrudgingly here. Ideally we'd use just `export`, though this entire SDK expects things to be exported as a default. Instead of breaking everything, we'll sacrifice our export pattern for a smaller diff - a later commit can always do the default export -> regular export conversion.
 2019-12-22 21:01:02 -07:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski
3a8ab6ec2b
Merge pull request #3736 from matrix-org/t3chguy/stop_using_deprecated_keyCode 
Stop using KeyboardEvent.keyCode as it is deprecated
 2019-12-17 09:55:13 +00:00
Michael Telatynski
d28a892bb0 Stop using KeyboardEvent.keyCode as it is deprecated 2019-12-16 17:14:03 +00:00
Michael Telatynski
5ab98e9899 open ImageView when clicking on a set avatar 2019-12-16 15:21:05 +00:00
Michael Telatynski
9fa2680dc6 Implement new design for uploading/removing avatars 2019-12-16 14:58: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
3cbb3c12cd Update cross-signing details on trust changes 2019-12-12 15:42:27 +00:00
J. Ryan Stinnett
458cc9598d Support restoring key backup with stored secret 2019-12-12 15:18:36 +00:00
J. Ryan Stinnett
e87ff54eee Clean up cross-signing debug panel 2019-12-12 14:27:57 +00:00
J. Ryan Stinnett
4417235d9e Show whether backup key is stored 2019-12-12 14:06:44 +00:00
J. Ryan Stinnett
d2f2d3b344 Handle cross-singing sigs in key backup details 2019-12-12 13:51:45 +00:00
J. Ryan Stinnett
8cbc9baddd Add testing flow for new key backups with SSSS 
This adds a path to test key backups with SSSS via an extra button only visible
when the cross-signing feature is enabled.
 2019-12-11 16:32:49 +00:00
J. Ryan Stinnett
66f7600969 Add accessSecretStorage helper with common flow setup 
This moves the details of dialogs that may be needed when accessing secret
storage to centralised helper. In addition, this clears the secret storage key
cache so that keys are only live for a single operation.
 2019-12-11 15:07:46 +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
Half-Shot
6225e402cc i18n'ed all over the plaace 2019-12-09 13:54:21 +00:00
Half-Shot
d9943754f7 Remove status as it's no longer part of the MSC 2019-12-09 13:28:16 +00:00
Will Hunt
ce21ce8bbe Lint 2019-12-09 13:22:45 +00:00
Half-Shot
9f2ccdf913 Add support for displaying avatars and links in bridge info 2019-12-09 13:22:45 +00:00
Half-Shot
0d537ecbb3 Add bridge info tab 2019-12-09 13:22:45 +00:00
Michael Telatynski
d22985f12e Migrate string refs over to createRef 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-08 12:16:17 +00:00
J. Ryan Stinnett
9f1c2cd3e1 Add dialogs for creating and accessing secret storage 
This adds dialogs for creating and accessing secret storage via a passphrase or
recovery key. These flows are adapted from the ones used for key backup.
 2019-12-05 15:34:07 +00:00
J. Ryan Stinnett
139e19630a Watch for account data changes in debug panel 2019-12-02 14:34:32 +00:00
J. Ryan Stinnett
c21c0e1150 Add error to debug panel 2019-12-02 14:22:47 +00:00
J. Ryan Stinnett
798d5c8ada Always update cross-signing status even if error 2019-11-29 17:53:39 +00:00
J. Ryan Stinnett
c32c1d201c Rename device signing auth param 2019-11-29 17:49:51 +00:00
J. Ryan Stinnett
6140803b7f Fix key upload auth to test confirmation 2019-11-29 17:43:24 +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
a21285143f Add tbody to silence React warning 2019-11-29 11:55:36 +00: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
Travis Ralston
5aad914c25
Merge pull request #3675 from aaronraimist/labs-explain 
Add a link to the labs feature documentation
 2019-11-28 22:07:47 -07: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
Travis Ralston
96ffe94876 Merge remote-tracking branch 'origin/develop' into t3chguy/clear_notifications 2019-11-27 19:27:52 -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
Travis Ralston
72f0401589 Merge branch 'develop' into jryans/4s-new-key-backup 2019-11-21 10:22:13 -07:00
Travis Ralston
f7f22444e8 Rename section heading for integrations in settings 
Misc design update
 2019-11-21 09:03:07 -07:00
Travis Ralston
6597e0bd42
Merge pull request #3646 from matrix-org/travis/integration-manager-opt 
Add an option to disable the use of integration managers for provisioning
 2019-11-21 08:10:56 -07: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
Travis Ralston
94fed922cf Intercept cases of disabled/no integration managers 
We already intercepted most of the cases where no integration manager was present, though there was a bug in many components where openAll() would be called regardless of an integration manager being available.

The integration manager being disabled by the user is handled in the IntegrationManager classes rather than on click because we have quite a few calls to these functions. The StickerPicker is an exception because it does slightly different behaviour.

This also removes the old "no integration manager configured" state from the IntegrationManager component as it is now replaced by a dialog.
 2019-11-20 20:40:39 -07:00
Travis Ralston
81c9bdd9f3 It's called an "Integration Manager" (singular) 
Fixes https://github.com/vector-im/riot-web/issues/11256

This was finally annoying me enough to fix it.
 2019-11-20 20:14:25 -07:00
Travis Ralston
3391cc0d90 Add the toggle switch for provisioning 2019-11-20 20:05:32 -07:00
Travis Ralston
0a0e952691 Update integration manager copy 2019-11-20 19:53:52 -07:00
Travis Ralston
b0eb54541c Rip out options to change your integration manager 
We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there.
 2019-11-20 19:50:13 -07:00
J. Ryan Stinnett
e6dea37693 Add hidden button for bootstrapping SSSS 
This adds an testing button to the key backup panel which bootstraps the Secure
Secret Storage system (and also cross-signing keys).

Fixes https://github.com/vector-im/riot-web/issues/11212
 2019-11-20 17:56:44 +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
J. Ryan Stinnett
9dea848927 Use div around buttons to fix React warning 2019-11-19 16:28:49 +00:00
J. Ryan Stinnett
cf26f14644 Switch to function properties to avoid manual binding in KeyBackupPanel 2019-11-18 17:43:34 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Michael Telatynski
5c24547ef5 re-add and actually use promise timeout util 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 09:37:26 +00:00
Michael Telatynski
79ebb9091c
Merge branch 'develop' into t3chguy/remove_bluebird_1 2019-11-12 18:16:34 +00:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07: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
217dfc3eed Replace all trivial Promise.defer usages with regular Promises 
(cherry picked from commit 44401d73b4)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
548e38cba9 Revert "Replace all trivial Promise.defer usages with regular Promises" 
This reverts commit 44401d73
 2019-11-12 11:56:53 +00:00