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

249 commits

Author SHA1 Message Date
Bruno Windels
8a964dbff0 avoid ref by getting count in setter callback 2020-03-04 17:19:54 +01:00
Bruno Windels
afc7273d10 use pendingUpdateCount rather, so we don't show multiple spinners 2020-03-04 16:58:04 +01:00
Bruno Windels
29af8add5d only show verify button if user has uploaded cross-signing keys 2020-03-04 16:10:06 +01:00
Bruno Windels
400cb33247 put state declaration on top 2020-02-27 12:35:34 +01:00
Bruno Windels
50b64d8c55 add local echo for clicking 'start verification' button 2020-02-26 18:30:20 +01: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
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
Bruno Windels
818156663a don't leak if show_sas never comes (or already came) 2020-02-24 17:00:55 +01: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
Bruno Windels
2350d102e3 update phase when request prop changes 2020-02-24 13:39:20 +01: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
93674ec781
Merge pull request #4070 from matrix-org/bwindels/oneverifrequest 
Find existing requests when starting a new verification request
 2020-02-14 15:33:27 +00:00
Bruno Windels
30718e7fde unsent could potentially also happen here 
although should not happen in practice
 2020-02-14 13:48:38 +01:00
Bruno Windels
a6c072ab42 only show supported verification methods 
also an error message if none match
 2020-02-14 13:48:18 +01:00
Zoe
37f1104f61 lint 2020-02-13 14:15:08 +00:00
Zoe
c3af1a2f95 don't be too magic about hiding tooltips 2020-02-13 13:47:39 +00:00
Bruno Windels
4b7cc12daa check if there is already a request in progress when clicking verify 
and go straight there instead of first showing EncryptionInfo panel
 2020-02-13 14:34:44 +01:00
Bruno Windels
68197a1d18 also update phase after starting request 
as it might now be a request that is already ongoing
 2020-02-13 14:33:35 +01:00
Bruno Windels
d49fbf25f7 check if verifier sasEvent was already set on mount 
this allow the verification panel to fully recover
the UI state from an on-going verification request
 2020-02-13 14:32:33 +01:00
Bruno Windels
ec708b5e9b
Merge pull request #4058 from matrix-org/bwindels/dontpassmethodstoverify 
remove methods arg to requestVerification(DM)
 2020-02-13 08:51:36 +00:00
Zoe
e1608509d0 Disable 'start' button after clicking in VerificationPanel 2020-02-12 13:53:16 +00:00
Bruno Windels
33f3a61b94 remove unused imports 2020-02-11 18:23:05 +01:00
Bruno Windels
a1844e44f2 remove methods arg to requestVerification(DM) 
as it's easy to have this argument be out of sync from all
the places this is called from the js-sdk. There is also little point,
as you can already specify the methods a consumer of the js-sdk
wants to provide through the verificationMethods option when creating
the client object.
 2020-02-11 18:22:48 +01: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
1d39aa6a81
Merge pull request #4049 from matrix-org/bwindels/verifybuttonsdisable 
Disable verification buttons after clicking to avoid double submission
 2020-02-11 15:35:00 +00:00
Bruno Windels
5267dbf44a
Update src/components/views/right_panel/UserInfo.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-11 15:21:01 +00:00
Bruno Windels
4b8382b5c4 remove dead code 2020-02-10 17:07:02 +01:00
Bruno Windels
a693af0c6b fix lint 2020-02-10 16:19:27 +01:00
Bruno Windels
2a8453b939 i18n fixes 2020-02-10 16:19:27 +01:00
Bruno Windels
9059f00b29 move css to correct file 
Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
 2020-02-10 16:19:27 +01:00
Travis Ralston
ea4d97fa73 Hack in a layout option 2020-02-10 16:19:27 +01:00
Bruno Windels
5c89b41177 make device verification go over right panel (after showing dialog) 
dialog should be more or less as in the design
 2020-02-07 18:36:46 +01:00
Bruno Windels
577121e88d disable "verify by emoji" after clicking it 2020-02-07 15:50:51 +01:00
Travis Ralston
724cff6a2e Update QR code rendering to support VerificationRequests 
Makes for building the QR code easier and more common.
 2020-01-30 17:12:44 +00:00
David Baker
8a09cfbfbd
Merge pull request #3999 from matrix-org/dbkr/user_info_black_shields 
Make shields in UserInfo black if user isn't verified
 2020-01-30 16:30:19 +00:00
David Baker
4f62fc16bd lint 2020-01-30 16:19:04 +00:00
David Baker
77618d30fd Actually this is green because it's a link 
not because the things were verified. Use the linkButton class
 2020-01-30 16:08:42 +00:00
David Baker
0956d00637 Make shields in UserInfo black if user isn't verified 2020-01-30 15:59:03 +00:00
J. Ryan Stinnett
fd5798aa87 Change verify user text 2020-01-30 13:21:51 +00:00
J. Ryan Stinnett
eaa48665d2 Guard request input 2020-01-29 21:59:30 +00:00
J. Ryan Stinnett
7a5bf8f102 Update user info for device and trust changes 
This ensure the user info panel updates automatically for device and trust
changes.

Fixes https://github.com/vector-im/riot-web/issues/12134`
 2020-01-29 21:55:29 +00:00
David Baker
ac173e9d50
Merge pull request #3984 from matrix-org/dbkr/rightpanel_verif_phase 
Fix various races that prevented the right panel being in the right state for verifications
 2020-01-29 18:03:27 +00:00
Bruno Windels
ad458722dc evaluate on mount whether we need to call .verify() 
as the request might be in phase started already.
 2020-01-29 17:58:23 +01:00
David Baker
e403169e13 Fix various races that prevented the right panel being in the right state for verifications 
Fixes https://github.com/vector-im/riot-web/issues/11989
 2020-01-29 16:56:12 +00:00
J. Ryan Stinnett
067bfe2ee3 Tweaks from PR 2020-01-29 16:10:46 +00:00
J. Ryan Stinnett
81ee27f41e Replace device with session in UI text 
This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
 2020-01-29 15:52:32 +00:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more 
Replace Verify button in UserInfo verification with "Learn more"
 2020-01-29 15:27:46 +00:00
Bruno Windels
44bc0d9fb1 phase is a prop now 2020-01-29 15:45:36 +01:00
Bruno Windels
59dc3cfb97 update immediately, don't wait until verification is done 
this can deadlock, as you can't finish the verification without the UI
 2020-01-29 15:27:55 +01:00
Michael Telatynski
00dd1a4a8f Re-use existing classes to fix font-size matching 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 14:22:20 +00:00
Michael Telatynski
19e7c768b6 Replace Verify button in UserInfo verification with "Learn more" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 14:11:50 +00:00
Michael Telatynski
957e862939 Update copy some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 13:58:02 +00:00
Michael Telatynski
a549c42022 Update copy for right panel verification 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-29 12:10:50 +00:00
Michael Telatynski
b24c7f3a04
Merge pull request #3967 from matrix-org/t3chguy/cs_verification_decoration 
Right Panel Verification improvements
 2020-01-29 09:46:24 +00:00
Michael Telatynski
37e568448d delint 2020-01-29 08:08:52 +00:00
Michael Telatynski
0bb423fd5a Add console log on unhandled error to track down rageshake 2020-01-29 08:00:32 +00:00
Michael Telatynski
d824145638 show as pending whilst in an empty state until told better to prevent a flash 2020-01-29 07:54:10 +00:00
Michael Telatynski
3d47e25955 improve PropTypes for better rageshakes 2020-01-29 07:53:45 +00:00
Michael Telatynski
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration 
Cross Signing Right Panel Verification Decoration
 2020-01-28 23:57:48 +00:00
Michael Telatynski
5c44ff8f8a other PR iteration based on feedback 2020-01-28 23:48:00 +00:00
Michael Telatynski
7b5a8856a4 Passing refireParams actually prevented this from working 2020-01-28 22:06:04 +00:00
J. Ryan Stinnett
32cb3b8ccb onClick to separate line 2020-01-28 19:55:53 +00:00
J. Ryan Stinnett
6fb8f6eef1 Add device IDs in user info tooltips 
For easier device identification, add the device ID in an HTML tooltip for now.

Fixes https://github.com/vector-im/riot-web/issues/12103
 2020-01-28 18:03:51 +00:00
Michael Telatynski
58df4127d3 Update propTypes and remove todo 2020-01-28 17:14:48 +00:00
Michael Telatynski
657457c14b Apply remainder of ux 2020-01-28 11:13:09 +00:00
Michael Telatynski
db1d3c091e Error handle the no QR verif case better 2020-01-27 17:21:31 +00:00
Michael Telatynski
ca5d4d88a2 Style the QR code 2020-01-27 17:17:05 +00:00
Michael Telatynski
50b491d7e5 post merge fix 2020-01-27 15:48:19 +00:00
Travis Ralston
540a7f5c02 less duplication 2020-01-24 09:41:47 -07:00
Michael Telatynski
b67256c7c2 post-merge fix 2020-01-24 16:41:43 +00:00
Travis Ralston
91d59556db Also check for our own key ID 2020-01-24 09:37:12 -07:00
Travis Ralston
f8e0dcf264 Add null check for cross-signing info in verification panel 2020-01-24 09:33:55 -07:00
Michael Telatynski
342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
 2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88 Apply a huge part of the decorations and copy 2020-01-24 16:16:46 +00:00
Travis Ralston
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp 
QR code verification
 2020-01-24 08:55:40 -07:00
Michael Telatynski
210616c737 Phase 1, split out UserInfo into a generic Pane, use for EncInfo 2020-01-24 11:45:39 +00:00
Michael Telatynski
0078c2f099
Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll 
Make the entire User Info scrollable, sticky close button
 2020-01-24 10:22:17 +00:00
Travis Ralston
b7e680ba51 Fix key ID 2020-01-23 20:14:27 -07:00
Travis Ralston
b682e7d908 Generate a QR code for apps to scan 2020-01-23 20:05:32 -07:00
Travis Ralston
586a240e41 Don't use private keys for QR code 2020-01-23 19:29:54 -07:00
Travis Ralston
1ec746c014 Add verification with QR codes 2020-01-23 19:29:54 -07:00
Michael Telatynski
237a0ed071 Make the entire User Info scrollable, sticky close button 2020-01-23 16:09:32 +00:00
J. Ryan Stinnett
1e25b32ba3 Enable encryption in DMs with device keys 
When the cross-signing lab is enabled, this changes DMs to use encryption as
long as all invited users have uploaded device keys (which we're using as a
proxy for "has some client that understands E2E").

Fixes https://github.com/vector-im/riot-web/issues/12005
 2020-01-23 16:03:42 +00:00
J. Ryan Stinnett
9c0cf326c1 Only show devices and verify actions in E2EE rooms 
This changes logic to only show the devices list and verify button in E2EE
rooms, matching the design.

Fixes https://github.com/vector-im/riot-web/issues/11839
 2020-01-21 15:13:03 +00:00
J. Ryan Stinnett
b3d56b378e Use cross-signing verification only for own devices 
The device verification checks are slightly more nuanced: we want to use
stricter cross-signing checks for your own devices to encourage everyone to
trust their devices via cross-signing so that other users can in turn trust
them.

However, for other users, it's okay to use the looser verification check that
also includes locally verified devices.
 2020-01-21 12:03:52 +00:00
J. Ryan Stinnett
8a00ff7f1f Change all user info verification checks to cross-signing 
This fixes some user vs. device verification confusion in user info by changing
all the verification tests to the cross-signing variant when the lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11886
 2020-01-21 11:00:40 +00:00
Bruno Windels
a73b7229a7 fix lint 2020-01-17 16:31:38 +01:00
Bruno Windels
d20db3560a fix import paths after build system refactor 2020-01-17 15:50:27 +01:00
Travis Ralston
d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -07:00
Travis Ralston
cd9fc72fff Merge branch 'develop' into t3chguy/rightpanel 2020-01-16 10:04:18 -07:00
Michael Telatynski
0f61aa57ff
Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-16 17:00:04 +00:00
Travis Ralston
5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
Michael Telatynski
9c686bf501 Fix right panel buttons highlighting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-13 12:15:54 +00:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski
0a9d7f43c6 pass the correct phase params for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 15:51:19 +00:00
Michael Telatynski
7dfc392a2b Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-09 15:48:06 +00:00
Michael Telatynski
a62c260f79 Fix userinfo for users not in the room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-07 12:58:24 +00:00
Michael Telatynski
6a1f4c41ce
Merge pull request #3788 from matrix-org/t3chguy/user_info_non-historical 
User Info fetch latest RoomMember instead of showing historical data
 2020-01-06 11:25:54 +00:00
Michael Telatynski
4118faa834 When looking at a MemberInfo, clicking on MemberList should close not switch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 20:31:07 +00:00