OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,663 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

9911 Commits (e2bb0a3b466a1be9ea6cdae40968069897132dfc)

Author SHA1 Message Date
David Baker e2bb0a3b46
Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy 
Update copy on SSSS symmetric upgrade toast
 2020-03-26 12:04:58 +00:00
David Baker 091e094759
Merge pull request #4270 from matrix-org/dbkr/wait_for_upgrade_to_complete 
Wait for SSSS upgrade to complete
 2020-03-26 12:04:52 +00:00
Michael Telatynski 39fdde627d
Merge pull request #4278 from matrix-org/t3chguy/e2e_copy 
Update cross-signing verification copy and fix i18n
 2020-03-26 11:55:36 +00:00
David Baker 8a64caa925 Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy 2020-03-26 11:14:33 +00:00
David Baker 95828ce751 Remove duplicate import 2020-03-26 11:13:57 +00:00
David Baker 8532c72fce Update copy on SSSS symmetric upgrade toast 
Fixes https://github.com/vector-im/riot-web/issues/12881
 2020-03-26 11:12:00 +00:00
David Baker 4586971a82 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete 2020-03-26 11:10:07 +00:00
Bruno Windels 44ce5b5764
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip 
Fix: make self-verification wait for incoming request
 2020-03-26 10:08:15 +00:00
Michael Telatynski 7ca6a4b777 Iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 23:00:46 +00:00
Michael Telatynski be3167c870 always show Devices section 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 22:44:09 +00:00
Michael Telatynski d098c91c30 Update cross-signing verification copy and fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 22:38:11 +00:00
J. Ryan Stinnett d869ac9a69
Merge pull request #4268 from matrix-org/jryans/robust-secret-share 
Log and display secret sharing cache state
 2020-03-25 15:00:04 +00:00
Travis Ralston a7913f4fe5
Merge pull request #4266 from matrix-org/travis/config-wrapper 
Support sending config and ready events to capable widgets (Jitsi)
 2020-03-25 08:26:01 -06:00
Bruno Windels 78b167a7ea fix typo 2020-03-25 13:40:09 +01:00
Bruno Windels 792a7b3953 don't throw here 2020-03-25 13:07:07 +01:00
Zoe b7013c6f5d
Merge pull request #4273 from matrix-org/foldleft/12704-key-requests 
If cached keys are present in the key backup dialog, use them
 2020-03-25 11:58:24 +00:00
Zoe 936a4a0022 lint 2020-03-25 11:47:07 +00:00
Zoe 8b2ae3e20f If cached keys are present in the key backup dialog, use them 2020-03-25 11:41:59 +00:00
Bruno Windels 8521ed1a45
Merge pull request #4265 from ThobyV/thobyv/hide-formatbar-onEnter-highlighted-message 
Fix formatbar not hidden on highlighted message sent
 2020-03-25 09:01:36 +00:00
David Baker be50f80314 Wait for SSSS upgrade to complete 
and show a spinner while it completes
 2020-03-24 19:02:57 +00:00
thobyv-kismat b817c06c6e fix failing linter tests 2020-03-24 19:09:50 +01:00
thobyv-kismat 91b9a04ede refactor:consider checking if no placeholder 2020-03-24 19:00:43 +01:00
Travis Ralston bdcb65de77 Support and send the config over to capable widgets 
For https://github.com/vector-im/riot-web/pull/12845
 2020-03-24 09:55:54 -06:00
J. Ryan Stinnett 1c802cc6af Show private key cache state in debug panel 2020-03-24 15:50:08 +00:00
Bruno Windels 3e59127d12 use SetupEncryptionBody to show a dialog from "Verify this session" 2020-03-24 16:39:43 +01:00
Bruno Windels 4ff847c8a3 put CompleteSecurity state management in store 
and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
 2020-03-24 16:10:15 +01:00
David Baker 8f0e5f76af Merge remote-tracking branch 'origin/develop' into dbkr/unify_cross_signing_checks 2020-03-24 13:27:12 +00:00
David Baker 0fce57f891 Probably OK for debugging info to access private stuff 2020-03-24 13:13:28 +00:00
David Baker 96ec18a662
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate 
Migration to symmetric SSSS
 2020-03-24 13:12:24 +00:00
David Baker 5e1a46c656 Update for new name 2020-03-24 13:03:07 +00:00
thobyv-kismat d7953dfa6d fix formatbar not hidden on highlighted message sent 2020-03-24 13:09:06 +01:00
David Baker d6d15bc5c7 Add secret storage outdated section to advanced 2020-03-24 11:17:33 +00:00
David Baker 99f12a695d
Merge pull request #4262 from matrix-org/dbkr/priority_toasts 
Always display verification request toasts on top
 2020-03-24 09:51:35 +00:00
Bruno Windels edd84ffd3a
Merge pull request #4249 from matrix-org/bwindels/assumemethodswhentodevice 
Fix: assume SAS is supported when starting request with .start
 2020-03-23 19:39:43 +00:00
Michael Telatynski 8839383e16
Merge pull request #4261 from matrix-org/t3chguy/no_e2ee_logout 
Fix logout when Olm failed to load.
 2020-03-23 18:50:33 +00:00
David Baker 281bc09c9a Use unified function to check cross-signing is ready 
Fixes mismatches where the Cross signing panel would say cross
signing was not ready but no toasts would appear.

Fixes https://github.com/vector-im/riot-web/issues/12796
Fixes https://github.com/vector-im/riot-web/issues/12798
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1279
 2020-03-23 18:36:37 +00:00
David Baker eae690f3ef Always display verification request toasts on top 
As they're interactive and time-sensitive.

Fixes https://github.com/vector-im/riot-web/issues/12141
 2020-03-23 15:52:59 +00:00
Michael Telatynski 1469690835 Fix logout when Olm failed to load. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-23 14:48:55 +00:00
Bruno Windels cef1fd55b2
Merge pull request #4260 from matrix-org/bwindels/filtercanon-altaliases 
Fix: filter room list (again) by canonical and alternative aliases
 2020-03-23 12:48:03 +00:00
Bruno Windels 51c78809e6 filter room list by canonical and alternative aliases 2020-03-23 12:34:23 +01:00
Michael Telatynski 27ec81f1a2 Migrate RoomView to React Contexts in the hope for better temporal stability 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-22 09:41:14 +00:00
Michael Telatynski a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/LoggedInView.js
 2020-03-20 16:10:27 +00:00
Michael Telatynski 064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/RoomView.js
 2020-03-20 16:06:07 +00:00
Michael Telatynski 8a0ee2fd34 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 16:00:50 +00:00
Michael Telatynski 75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Bruno Windels 39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels 1620f2159b add 2020 foundation copyright 2020-03-20 15:36:58 +01:00
Bruno Windels b97b887305 fix lint 2020-03-20 15:36:58 +01:00
Bruno Windels 510b71b0e5 extract manual device verification out of device verify dialog 
as the plan is to remove the latter
 2020-03-20 15:36:58 +01:00
Bruno Windels 301b484371 ask request if method is supported rather than checking ourselves 2020-03-20 13:37:00 +01:00