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

574 commits

Author SHA1 Message Date
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
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