PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
24596 commits 1 branch 0 tags 338 MiB
Commit graph

1750 commits

Author SHA1 Message Date
Michael Telatynski
6d33138950 op/deop return error if trying to affect an unknown user 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 16:41:07 +01:00
Travis Ralston
879b4e15e5 Use singular text on 'delete sessions' button for SSO 
Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357

Not a release blocker at this time.
 2020-04-09 16:18:12 -06:00
Travis Ralston
b518fdd8ee i18n 2020-04-09 16:05:31 -06:00
Michael Telatynski
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee 
Add toggle for e2ee when creating private room
 2020-04-09 17:22:58 +01:00
Michael Telatynski
4041c030a5 Apply changes from Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 13:47:15 +01:00
J. Ryan Stinnett
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso 
Support deactivating your account with SSO
 2020-04-08 12:19:53 +01:00
J. Ryan Stinnett
a5f6a07ed6
Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format 
Add debug status for cached backup key format
 2020-04-08 11:32:11 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 10:50:22 +01:00
Zoe
17f3b92726
Merge pull request #4345 from matrix-org/foldleft/12982-notifications 
Don't show fallback text for verification requests
 2020-04-08 09:46:56 +01:00
J. Ryan Stinnett
3196c1a031 Update i18n 2020-04-07 19:24:07 +01:00
J. Ryan Stinnett
c21dccc397 Add debug status for cached backup key format 
Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
 2020-04-07 19:11:06 +01:00
Travis Ralston
3ab9634249 Pluralize more differently 2020-04-07 11:46:53 -06:00
Travis Ralston
3be197cf86 Use singular copy when only deleting one device 2020-04-07 11:19:56 -06:00
Michael Telatynski
faab35738f Add new default home page fallback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 10:48:56 +01:00
Travis Ralston
bdeba252ec Support deactivating your account with SSO 
Fixes https://github.com/vector-im/riot-web/issues/12940
 2020-04-06 15:42:06 -06:00
Zoe
959801cf2f Special-case certain msgtypes for notifications 2020-04-06 16:26:04 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Bruno Windels
37289bc832 i18n 2020-04-03 17:05:20 +02:00
Bruno Windels
6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00
Bruno Windels
cc9c5cabb3 adapt encryption info to self-verification 
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
 2020-04-02 17:51:25 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
Michael Telatynski
1ae370b97e Pull feature_presence_in_room_list out of labs. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-02 15:20:35 +01:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
a4f448d4ca update i18n 2020-04-02 13:44:19 +02:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia 
Support SSO for interactive authentication
 2020-04-01 10:27:24 -06:00
Michael Telatynski
6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds 
 Conflicts:
	src/SlashCommands.tsx
 2020-03-31 11:49:53 +01:00
Michael Telatynski
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso 
Support $riot: Templates for SSO/CAS urls in the welcome.html page
 2020-03-31 09:39:40 +01:00
Travis Ralston
2557875fd2
Merge pull request #4296 from waylon531/upstream 
Added the /html command
 2020-03-30 20:56:24 -06:00
Travis Ralston
de79520150 Add SSO dialog copy for 3PID adding (email/phone) 2020-03-30 20:18:52 -06:00
Travis Ralston
ffa75ef48c Wire up all the dialog parts for SSO, using device deletion as a POC 2020-03-30 20:03:46 -06:00
Travis Ralston
b35356833f Merge branch 'develop' into travis/sso-uia 2020-03-30 14:56:52 -06:00
waylon531
9cf82d8743
Updated strings 
I added a new string for the /html command and had to regerate strings
for i18

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-03-30 11:44:34 -07:00
Michael Telatynski
559b8e174b undo accidental changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 14:13:08 +01:00
Michael Telatynski
167f953ac7 Document Composer:Escape to cancel a reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:35:35 +01:00
Travis Ralston
1e30bdb739 Early proof of concept for SSO UIA 
It works well enough to start doing design.
 2020-03-27 14:39:59 -06:00
Michael Telatynski
de0895b881 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-27 14:06:21 +00:00
Michael Telatynski
98f9f1e956 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-27 09:59:43 +00:00
David Baker
1f12d16b70
Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached 
Show whether backup key is cached
 2020-03-27 09:31:03 +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
ce77593cf9 rename toast title 2020-03-26 17:37:44 +01:00
Zoe
04849f7f0d incorporated design feedback 2020-03-26 13:47:32 +00:00
Zoe
9c392ce8bb Merge branch 'develop' into foldleft/better-errors 2020-03-26 13:38:50 +00: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
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
f7e9cf4552 i18n 2020-03-26 11:15: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
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
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
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
Bruno Windels
7cded53cdb fix i18n 2020-03-24 17:02:36 +01:00
J. Ryan Stinnett
1c802cc6af Show private key cache state in debug panel 2020-03-24 15:50:08 +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
d6d15bc5c7 Add secret storage outdated section to advanced 2020-03-24 11:17:33 +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
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
073c2c525f Add "legacy verify" button to untrusted session dialog 2020-03-20 15:36:58 +01:00
Michael Telatynski
2b40bb905a Add shortcut CmdOrCtrl+. to toggle right panel. Gets rid of forced-update on right panel changes which may not be the ones we care about. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 00:18:24 +00:00
Michael Telatynski
7d28137cfd Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-19 19:18:20 +00:00
Michael Telatynski
578b3f2b97 Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 19:07:33 +00:00
Travis Ralston
20d0e8a888
Merge pull request #4234 from matrix-org/travis/wrapped-jitsi 
Use a local wrapper for Jitsi calls
 2020-03-19 11:52:14 -06:00
Michael Telatynski
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes 
Invite Dialog fixes
 2020-03-19 17:32:30 +00:00
Zoe
d4486a3eeb
Merge pull request #4229 from matrix-org/foldleft/11574-handle-upload-errors 
Report to the user when a key signature upload fails
 2020-03-19 16:00:18 +00:00
Travis Ralston
2a68479f5a Remove unused strings 2020-03-18 15:53:05 -06:00
Michael Telatynski
22c8df9f23 Update DM invite copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-18 21:08:37 +00:00
Michael Telatynski
d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +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
Michael Telatynski
ef79492f2c
Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory 
Room Directory Explore Servers redesign
 2020-03-18 11:51:42 +00:00
Travis Ralston
1453120c66
Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock 
Rename 'jump to bottom' to avoid ublock block
 2020-03-17 13:06:41 -06:00
Matthew Hodgson
af023a2d7c rename 'jump to bottom' to avoid ublock block 2020-03-17 11:15:57 -06:00
Zoe
ea99eebb7b Report to the user when a key signature upload fails 2020-03-17 11:45:27 +00:00
Bruno Windels
e8c77543f9
Merge pull request #4221 from matrix-org/bwindels/aliaslipstick 
Fix: make alternative addresses UX less confusing
 2020-03-17 10:55:36 +00:00
Bruno Windels
010661249b run i18n 2020-03-17 11:47:56 +01:00
David Baker
6c4b572c7e Wait for verification request on login 
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
 2020-03-16 17:47:56 +00:00
Bruno Windels
d6ddc5096f tweak labels, etc 2020-03-16 18:25:13 +01:00
Bruno Windels
31cb257eb9 add headers and copy to lessen confusion of new alias workings 2020-03-16 17:28:45 +01:00
Michael Telatynski
78543da7f4 Fix missed copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 12:28:20 +00:00
Michael Telatynski
6f27c4c17a s/Server address/Server name/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 11:45:51 +00:00
Aaron Raimist
06fce7158a
Rename Review Devices to Review Sessions 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-15 13:47:25 -05:00
Michael Telatynski
ee1659625c Add Field validation to TextInputDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 17:32:02 +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
Michael Telatynski
401d85ea6f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 14:42:19 +00:00
Michael Telatynski
dd4dc054ae i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:06:41 +00:00
Michael Telatynski
86e53ea2c3 Initial attempt to redesign explore servers in room directory 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:02:50 +00:00
Bruno Windels
6b552e5ce8
Merge pull request #4199 from matrix-org/bwindels/aliasrefinements 
Fixes for removing local alias
 2020-03-12 11:29:33 +00:00
Travis Ralston
d470f9649d
Merge pull request #4183 from aaronraimist/room-name-change-ev 
When room name is changed, show both the old and new name
 2020-03-11 11:08:52 -06:00
Bruno Windels
cccf7cd07f specific error for lack of permissions when trying to delete an alias 2020-03-11 12:13:28 +01:00
Bruno Windels
1ae4a1cd5b
Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent 
Add fallback label for canonical alias events that dont change anything
 2020-03-11 09:04:14 +00:00
Bruno Windels
f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify 
Enable 4S if needed when trying to verify or accepting verification
 2020-03-10 18:03:02 +00:00
Bruno Windels
5d7f2f96e7 add fallback label for canonical alias events that dont change anything 2020-03-10 18:45:51 +01:00
Bruno Windels
e34a37102a move i18n strings around as script desires 2020-03-10 16:56:20 +01:00
Bruno Windels
c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases 
Allow editing of alt_aliases according to MSC2432
 2020-03-10 12:45:16 +00:00
Bruno Windels
378939bed7 add timeline text descriptions for modifying alt_aliases 2020-03-09 18:24:48 +01:00
Bruno Windels
9961f810f1 update i18n 2020-03-09 16:54:00 +01:00
Bruno Windels
7079d70f18 hide local aliases by default 2020-03-09 16:32:13 +01:00
Bruno Windels
eb539537f2 add recommendations for alt aliases 2020-03-09 16:31:07 +01:00
Bruno Windels
ee9558cb0b change state from domainToAliases to local and alt aliases 2020-03-09 16:28:33 +01:00
Aaron Raimist
f9f87defa4 Only show old room name if it exists 2020-03-07 12:36:24 -06:00
Aaron Raimist
7850c506b7
When room name is changed, show both the old and new name 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-06 22:21:38 -06:00
Travis Ralston
6aeca7b853 UX polish for custom themes 2020-03-06 17:43:10 -07:00
Travis Ralston
65d7bb2ef9 Merge branch 'develop' into travis/poc/theme-command 2020-03-06 17:33:22 -07:00
Damir Jelić
69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit. 
This reflects now the latests design on Figma.
 2020-03-06 16:07:10 +01:00
Damir Jelić
364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. 2020-03-06 15:44:23 +01:00
Damir Jelić
bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms." 
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
 2020-03-06 15:44:23 +01:00
Damir Jelić
8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. 2020-03-06 15:44:23 +01:00
Travis Ralston
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button 
Include a mark as read X under the scroll to unread button
 2020-03-05 11:01:12 -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
d28d330b33 run yarn i18n 2020-03-05 14:33:40 +00:00
Travis Ralston
e83a4ddbe5 i18n 2020-03-03 23:24:56 -07:00
Michael Telatynski
f08d034f84
Merge pull request #4158 from matrix-org/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:27:48 +00:00
Mark Striemer
df9710907c Add en_US string 2020-03-02 15:45:16 -06:00
Michael Telatynski
f8045e428b riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 14:59:54 +00:00
Michael Telatynski
a5e664410f Add /whois SlashCommand to open UserInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-29 01:29:52 +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
Travis Ralston
60e26db729
Merge pull request #3829 from Cadair/login_group 
Add a Login button to startAnyRegistrationFlow
 2020-02-28 10:35:49 -07:00
J. Ryan Stinnett
5c81ae41dd
Merge pull request #4146 from matrix-org/jryans/locked-upgrade-dialog 
Prefer account password variation of upgrading
 2020-02-28 12:47:42 +00:00
J. Ryan Stinnett
b1543c4141 Regen i18n 2020-02-28 12:32:14 +00:00
Michael Telatynski
f036f0bd83 Fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:19:05 +00:00
Michael Telatynski
cada584c25 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:09:34 +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
Stuart Mumford
75a4289f54
fix i18n 2020-02-26 21:55:10 +00:00
Stuart Mumford
f980bfec9e
Improve copy 2020-02-26 21:55:10 +00:00
Stuart Mumford
e454d84e9d
Lint 
Signed-off-by: Stuart Mumford <stuart@cadair.com>
 2020-02-26 21:55:08 +00:00
Ben Parsons
92bc3e83ef yarn i18n 2020-02-25 17:57:31 +00:00
Ben Parsons
566db6c406 link to matrix.org/security-disclosure-policy in help screen 2020-02-25 17:29:59 +00:00
Bruno Windels
17d55abed7
Merge pull request #4126 from matrix-org/bwindels/verifuifeedbackonlag 
Improve UI feedback while waiting for network
 2020-02-25 17:08:06 +00:00
Zoe
1d8756b95d text improvements 2020-02-25 15:40:06 +00:00
Bruno Windels
682781aa48 better word smithing 2020-02-25 13:27:59 +01:00
Bruno Windels
2127edb7b8 show "Waiting for network" in EncryptionInfo after accepting in toast 2020-02-25 13:13:51 +01:00
Zoe
9ed83b8648 Show a warning dialog when user indicates a new session wasn't them 2020-02-25 11:37:01 +00:00
Zoe
3302469a2b Catch errors sooner so users can recover more easily 2020-02-24 18:04:11 +00:00
J. Ryan Stinnett
64dc776e43
Merge pull request #4118 from matrix-org/jryans/hs-xsign-check 
Check for cross-signing homeserver support
 2020-02-24 16:58:57 +00:00
J. Ryan Stinnett
a71a234622 Check for cross-signing homeserver support 
This checks the homeserver to ensure it supports cross-signing (via the versions
feature flag) before attempting bootstrapping or offering user verification.

Fixes https://github.com/vector-im/riot-web/issues/11863
 2020-02-24 15:04:34 +00:00
Zoe
72789897a0 Quick n dirty verificatio request viewer in devtools 2020-02-21 17:15:53 +00:00
Michael Telatynski
4278d44059 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-19 13:30:47 +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
Bruno Windels
1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods 
Only show supported verification methods
 2020-02-18 10:16:01 +00:00
Bruno Windels
05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2 
Use local echo in VerificationRequest for accepting/declining a verification request
 2020-02-18 09:55:27 +00:00
J. Ryan Stinnett
ca28f83841 Report touch input status in rageshakes, analytics 
This reports whether the device has touch input as a primary input mechanism in
rageshakes and analytics.

For analytics, this replaces the identity server (which ends up being reported
as "<redacted>" by default anyway) because Matomo only supports a limited number
of custom variables.
 2020-02-14 17:36:14 +00:00
J. Ryan Stinnett
ca4f591cb6 Report installed PWA status in rageshakes, analytics 
This adds installed PWA status reporting to rageshakes and analytics, as well as
cleaning up some related strings.
 2020-02-14 16:30:07 +00:00
Bruno Windels
a6c072ab42 only show supported verification methods 
also an error message if none match
 2020-02-14 13:48:18 +01:00
Bruno Windels
3292991491 provide specific label for when accepting/declining is in progress 
also distuingish between cancelling and declining
 2020-02-13 17:29:38 +01:00
Zoe
5382a52519 Fixed bug where key reset didn't always return the right key 2020-02-11 15:57:14 +00:00
Bruno Windels
7a026eb15d
Merge pull request #4043 from matrix-org/bwindels/showunverifieddevicedialogonclick 
Verify single device from other user in right panel & Not Trusted dialog
 2020-02-11 15:35:24 +00:00
Bruno Windels
a84e90df51
Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere 
Use EncryptionPanel everywhere, part I
 2020-02-11 15:16:47 +00:00