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

9932 commits

Author SHA1 Message Date
Zoe
a02731f632 Merge branch 'develop' into foldleft/reset-refactor 2020-03-27 10:50:05 +00:00
Michael Telatynski
cf4f595f79
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar 
blank out UserInfo avatar when changing between members
 2020-03-27 10:21:53 +00:00
Bruno Windels
2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel 
Add cancel button to verification panel
 2020-03-27 10:20:02 +00:00
Bruno Windels
a2737899c1
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars 
Fix: allow scrolling while window is not focused & remove scrollbar hack
 2020-03-27 10:16:53 +00:00
Michael Telatynski
a974f0fe46 blank out UserInfo avatar when changing between members 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-27 09:59:18 +00:00
David Baker
ccb3283fd3 Show whether backup key is cached 
in cross signing debug panel
 2020-03-26 18:50:31 +00:00
Bruno Windels
a6fbb98252 only show close button when not in a dialog, which already has one 2020-03-26 17:02:32 +01:00
Bruno Windels
34b0c1b1e7 fix lint & other cleanup 2020-03-26 16:54:31 +01:00
Bruno Windels
9b54d15fcd add cancel button to verification panel 2020-03-26 16:53:46 +01:00
Bruno Windels
053a5a5ff4
Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message 
Fix formatBar not hidden after highlight and backspacing some text
 2020-03-26 13:19:06 +00:00
thobyv-kismat
1713006958 recommit bwindels commited changes to refactor check logic after rebase mistake 2020-03-26 14:03:38 +01:00
David Baker
6d90307ff7
Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag 
Add a flag to control whether cross-signing signatures are trusted
 2020-03-26 12:19:14 +00:00
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
thobyv-kismat
2bd112ca7c add delete support and to keyboard shortcuts 2020-03-26 12:40:31 +01:00
thobyv-kismat
c95b23f3ec fix formatBar not hidden after highlight-backspacing text partially 2020-03-26 12:40:31 +01: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
785d0e99fb remove some remaining dead code 2020-03-26 11:17:35 +01:00
Bruno Windels
75cbc1dc07 Adjust IndicatorScrollbar to not rely on AutoHideScrollbar for overflow 2020-03-26 11:17:35 +01:00
Bruno Windels
0436507574 use transparent scrollbars on not hover to emulate scrolbar on hover 
allows us to get rid of the margin-right hack as well
 2020-03-26 11:17:35 +01: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
David Baker
a9e7bf9899 Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag 2020-03-26 09:40:09 +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
David Baker
327b3c860b Adding the files would help 2020-03-25 18:47:57 +00: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
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
Zoe
9dd81216fb rename secret storage force-reset variable to avoid confusion 2020-03-25 14:22:33 +00: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