Commit graph

9649 commits

Author SHA1 Message Date
Bruno Windels
4b8382b5c4 remove dead code 2020-02-10 17:07:02 +01:00
Bruno Windels
1ff1575b42 remove dead code 2020-02-10 16:59:47 +01:00
Zoe
69dc725006 rename button 2020-02-10 15:43:02 +00:00
Bruno Windels
936b40f6b5 remove commented out code 2020-02-10 16:19:27 +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
Bruno Windels
8c3004c2ac to_device requests now can include .request so we might need send .ready 2020-02-10 16:19:27 +01:00
Bruno Windels
a865cfb013 put encryption in a proper dialog with close button 2020-02-10 16:19:27 +01:00
Bruno Windels
39fab02fcc rename DeviceVerifyOwnDialog to VerificationRequestDialog
as it works (and we want to use it) for any verification request,
not just between two devices of the same user
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
ee23bfe625 need to close the current dialog before opening a new modal 2020-02-10 16:19:27 +01:00
Bruno Windels
f368339b78 cram EncryptionPanel into a Dialog when clicking from new session dialog 2020-02-10 16:19:27 +01:00
Bruno Windels
b210c9cb76 close dialog after clicking continue 2020-02-10 16:19:27 +01:00
Travis Ralston
469d533964 Apply some CSS 2020-02-10 16:19:27 +01:00
Bruno Windels
747a4866e2 indenting 2020-02-10 16:19:27 +01:00
Bruno Windels
3d91ff23ec cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog
so we get QR code support and support phases prior to STARTED
2020-02-10 16:19:27 +01:00
Travis Ralston
bc5a59339b Send NewSessionReviewDialog through dialogs 2020-02-10 16:19:27 +01:00
Bruno Windels
5866d67c88 Alterations to DeviceVerifyDialog to support picking QR code 2020-02-10 16:18:44 +01:00
Bruno Windels
6b85ca2fb9 add qr code method to new session dialog 2020-02-10 16:17:49 +01:00
Bruno Windels
496dfc6187 send a .request and open it in the right panel on new session verify 2020-02-10 16:17:05 +01:00
Michael Telatynski
74af4fd764 disabled submit button be disabled 2020-02-09 15:07:07 +00:00
Michael Telatynski
150f2b3f84 Merge branches 'develop' and 't3chguy/password_completion' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/password_completion 2020-02-09 14:19:44 +00:00
unknown
06ba55e1a1 I have made changes according to turt2live recommandations, mainly css indentation and variable definition 2020-02-09 15:05:08 +01:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
Michael Telatynski
40b8db84e3 Get rid of dependence on usercontent.riot.im 2020-02-07 22:07:29 +00: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
e016cbefff support header image in QuestionDialog 2020-02-07 18:36:41 +01:00
Zoe
a260d7a147 manual lint 2020-02-07 15:53:43 +00:00
Zoe
b08c5d8410 lint 2020-02-07 15:46:31 +00:00
Travis Ralston
3c49515e08
Merge pull request #4001 from matrix-org/travis/qr-code-request-based
Update QR code rendering to support VerificationRequests
2020-02-07 15:37:53 +00:00
Travis Ralston
f6abd369ca Fix comments 2020-02-07 15:36:57 +00:00
Travis Ralston
bdeb9cccc4 Rename estimatedTargetDevice to targetDevice 2020-02-07 15:34:45 +00:00
Bruno Windels
1a5bed5a10 open a to_device request in a modal instead of the right panel 1st room 2020-02-07 15:56:10 +01:00
Zoe
8fdae73e03 Button to reset cross-signing and SSSS keys 2020-02-07 14:55:01 +00:00
Bruno Windels
577121e88d disable "verify by emoji" after clicking it 2020-02-07 15:50:51 +01:00
Bruno Windels
413a149b47 disable "Accept"/"Decline" buttons on verif tile after clicking
to avoid sending double events
2020-02-07 15:50:42 +01:00
Bruno Windels
049a6d2064 hide toast when request is accepted
if this is a .request > .ready request, dismissing when in .ready is what we want, as that is how you accept the request
if this is a .start request, we shouldn't dismiss

so only add .ready to the phases to hide the toast, not .started
2020-02-07 15:49:44 +01:00
Bruno Windels
fa13bb9689 make the verif toast work with to_device request that do .request/.ready 2020-02-07 15:49:36 +01:00
Michael Telatynski
4d0d6cdaa4
Merge branch 'develop' into t3chguy/password_completion 2020-02-05 20:24:37 +00:00
J. Ryan Stinnett
110c5f0e61 Fix listener removal in verification tile
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2202
2020-02-04 23:13:55 +00:00
Zoe
f89ae19d76
Merge pull request #4028 from matrix-org/foldleft/12114-less-alarming-on-own-devices
Do not show alarming red shields on large encrypted rooms for your own device
2020-02-04 17:09:16 +00:00
rtestard
f023bcfd63 I have modified padlocks styling when the left panel is collapsed 2020-02-04 15:05:26 +01:00
Zoe
d822104159
Merge pull request #4010 from matrix-org/foldleft/11968-verify-verification
double-check user verification
2020-02-04 13:47:32 +00:00
Zoe
150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
Travis Ralston
bf9d5b7f01
Merge pull request #4027 from matrix-org/travis/fix-room-list
Don't crash immediately if the room directory chunk is null/empty
2020-02-04 09:36:12 +00:00
Zoe
fab54ab936
Merge pull request #3998 from matrix-org/zip/12038-toast-timeouts
Fix verification toast to close at 0s
2020-02-04 09:30:47 +00:00
Zoe
41f4b38fe8 Do not show alarming red shields on large encrypted rooms for your own device
Fixes: https://github.com/vector-im/riot-web/issues/12214
2020-02-03 16:53:32 +00:00
Travis Ralston
aa6eabcf57 Don't crash immediately if the room directory chunk is null/empty
Fixes https://github.com/vector-im/riot-web/issues/12197
2020-02-03 15:49:18 +00:00
David Baker
11cb3a60b2 Fix listener leak in TagPanel 2020-02-03 13:33:44 +00:00
J. Ryan Stinnett
2584772bfb
Merge pull request #4017 from matrix-org/jryans/e2e-copy-changes
Apply copy edits to security setup flow
2020-01-31 15:13:18 +00:00
J. Ryan Stinnett
16f72140b9
Merge pull request #4016 from matrix-org/jryans/verif-status-text
Fix user trust text to match what was checked
2020-01-31 15:12:52 +00:00
J. Ryan Stinnett
0fad5a62b4 Fix user trust text to match what was checked
This fixes the unverified users status text to omit devices since they haven't
been checked.

Fixes https://github.com/vector-im/riot-web/issues/12176
2020-01-31 14:06:57 +00:00
J. Ryan Stinnett
11008cfabf
Merge pull request #4013 from matrix-org/jryans/padlock-flag
Add temporary feature flag to control padlocks
2020-01-31 13:44:12 +00:00
David Baker
85489c4ec5
Merge pull request #4014 from matrix-org/dbkr/theme_is_login_override
Add an override for the theme
2020-01-31 13:30:12 +00:00
J. Ryan Stinnett
636b3696ed
Merge pull request #4011 from matrix-org/jryans/comp-sec-title
Add title to complete security loading
2020-01-31 13:22:22 +00:00
David Baker
cb9362456f remove setter 2020-01-31 13:18:01 +00:00
David Baker
2d9b111680 Add an override for the theme
So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
2020-01-31 12:28:14 +00:00
J. Ryan Stinnett
02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
J. Ryan Stinnett
b64ba1dbbf Add temporary feature flag to control padlocks
This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.

Fixes https://github.com/vector-im/riot-web/issues/12166
2020-01-31 11:09:49 +00:00
David Baker
c111d70deb
Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel
Log exceptions from accessSecretStorage
2020-01-31 11:00:16 +00:00
J. Ryan Stinnett
1a95a1d4ba Add title to complete security loading 2020-01-31 10:47:58 +00:00
J. Ryan Stinnett
19ab395c18
Merge pull request #3995 from matrix-org/jryans/4s-in-mem
Add advanced option to keep secret storage in memory for session
2020-01-31 10:45:57 +00:00
David Baker
ea7f160950 lint 2020-01-31 10:38:20 +00:00
Zoe
af0598bbcb double-check user verification 2020-01-31 10:37:40 +00:00
David Baker
26c9b64c3b Log exceptions from accessSecretStorage
Rather than ignoring everything assuming the user cancelled
2020-01-31 10:35:05 +00:00
J. Ryan Stinnett
68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco
Add shields to member list, move power label to text
2020-01-31 10:20:13 +00:00
David Baker
24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events
Make encryption events into bubble-style tiles
2020-01-31 10:20:03 +00:00
Zoe
36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +00:00
David Baker
d0ab37ac50 Only say the room is encrypted if it actually is 2020-01-31 09:58:21 +00:00
Zoe
585a38cd45
Merge pull request #4000 from matrix-org/foldleft/12038-copy
Update copy when the user verifies their own devices
2020-01-31 09:57:52 +00:00
J. Ryan Stinnett
3ef7e5113b Move power label to right of name
The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
57c4293fc6 Add verification status icons to room members
This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 21:38:40 +00:00
Michael Telatynski
7db6f89a9f hmm, there were two things using the client :((
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 21:07:32 +00:00
Michael Telatynski
1e09399dd6 delint and collapse two consecutive filter operations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 21:01:55 +00:00
David Baker
58d16fea7d lint 2020-01-30 20:59:27 +00:00
David Baker
2332cdb5d8
full stop
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-30 20:47:46 +00:00
David Baker
5447a04f8e oops, forgot the component 2020-01-30 20:15:15 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
Michael Telatynski
bc71092b81 Use Sets instead of array scans and simplify hiding of invalid users to invite
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 19:27:59 +00: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
Zoe
e58b59c26e don't tell users to verify themselves in person 2020-01-30 16:41:25 +00:00
J. Ryan Stinnett
bae35c0859 Change power icon to label instead 2020-01-30 16:40:25 +00:00
J. Ryan Stinnett
ceebb7dc55 Remove unused Entities, UserTile modules 2020-01-30 16:40:25 +00:00
Zoe
f787bde80a copy 2020-01-30 16:36:57 +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
Zoe
a9d85e1fa3 lint 2020-01-30 16:27:35 +00:00
David Baker
4f62fc16bd lint 2020-01-30 16:19:04 +00:00
J. Ryan Stinnett
ddc628c804
Merge pull request #3994 from matrix-org/jryans/verify-user-text
Change verify user text
2020-01-30 16:12:55 +00:00
Zoe
4a3ea30e52 copy for verification screen 2020-01-30 16:11:05 +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
Zoe
9f5f15d1d3 Update copy when the user verifies their own devices 2020-01-30 15:59:59 +00:00
David Baker
0956d00637 Make shields in UserInfo black if user isn't verified 2020-01-30 15:59:03 +00:00
Zoe
99b04a6f70 lint 2020-01-30 15:41:26 +00:00
Zoe
49d2ed8906 ... and take action when the counter reaches zero in verification toast 2020-01-30 15:37:44 +00:00
Zoe
7e98ea79d2 Fix verification toast timeouts to not stick at 0
Fixes: https://github.com/vector-im/riot-web/issues/12038
2020-01-30 15:31:20 +00:00
Zoe
318689f40b Disable all inputs in login form while busy, not just the submit button 2020-01-30 15:06:36 +00:00
J. Ryan Stinnett
788cb24093 Add advanced option to keep secret storage in memory for session
This adds a default-off option to keep the secret storage passphrase cached in
memory for the current session to avoid death by prompts.
2020-01-30 14:18:12 +00:00
J. Ryan Stinnett
fd5798aa87 Change verify user text 2020-01-30 13:21:51 +00:00
Zoe
767015d19d
Merge pull request #3993 from matrix-org/foldleft/12106-round-two
fix SAS dialog width
2020-01-30 13:10:32 +00:00
J. Ryan Stinnett
9c8ffb6c4e
Merge pull request #3990 from matrix-org/t3chguy/fix_composer_placeholder
Update placeholder in the composer when it gets changed
2020-01-30 13:08:42 +00:00
Zoe
4c1cc6feba fix SAS dialog width
used fixedWidth to accomplish the same goal

clean up css
2020-01-30 12:48:41 +00:00
David Baker
c8673452be Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register 2020-01-30 11:45:54 +00:00
David Baker
2f4b3272da Send initial device display najme on register
Fixes https://github.com/vector-im/riot-web/issues/12140
2020-01-30 11:27:54 +00:00
Michael Telatynski
52ed55d887 Update placeholder when it changes, not sure how this ever worked
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 00:23:19 +00:00
Michael Telatynski
ea0fafc4e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics 2020-01-29 22:55:02 +00:00
Michael Telatynski
33ec73095e Apply the Olympic effect to SAS Emoji Verification
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:44:49 +00:00
J. Ryan Stinnett
c851cc6070
Merge pull request #3987 from matrix-org/jryans/update-user-info-trust
Update user info for device and trust changes
2020-01-29 22:22:54 +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
J. Ryan Stinnett
786ddb8a7e
Merge pull request #3985 from matrix-org/jryans/relax-account-data-check
Relax secret storage account data check
2020-01-29 20:40:13 +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
David Baker
d63bb240aa
those words again
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-29 17:52:12 +00:00
David Baker
de6ef9ec90
words
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-29 17:51:51 +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
6f0d88a126 Relax secret storage account data check
If the homeserver is confused about account data or otherwise explodes here, we
don't want to block login, so just warn in this case.
2020-01-29 16:54:08 +00:00
J. Ryan Stinnett
6a94d84630
Merge pull request #3980 from matrix-org/jryans/cs-polish
Replace device with session in UI text
2020-01-29 16:32:40 +00:00
J. Ryan Stinnett
067bfe2ee3 Tweaks from PR 2020-01-29 16:10:46 +00:00
Michael Telatynski
a2734e6955 Add missing await causing promises to be leaked as room IDs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 15:56:26 +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
J. Ryan Stinnett
725ec1dda6
Merge pull request #3978 from matrix-org/jryans/cs-polish
Change new session toast to unverified
2020-01-29 15:33:19 +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
J. Ryan Stinnett
b5914f5c2b Fix later button 2020-01-29 15:14:56 +00:00
J. Ryan Stinnett
f12fe984e5 Change new session toast to unverified
This also changes text to show the device ID and name in the toast.

Fixes https://github.com/vector-im/riot-web/issues/11916
2020-01-29 15:00:04 +00:00
Bruno Windels
44bc0d9fb1 phase is a prop now 2020-01-29 15:45:36 +01:00
Bruno Windels
3590c97d96 unrelated fix: rerender hidden event tile when decrypted
to get accurate type
2020-01-29 15:27:55 +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
Bruno Windels
c4f1659116 don't dismiss toasts for device verification
as they are immediately started
2020-01-29 15:27:26 +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
64e96331ca
Merge pull request #3973 from matrix-org/t3chguy/update_copy
Update copy for right panel verification
2020-01-29 14:09:09 +00:00
J. Ryan Stinnett
c0e88bede9
Merge pull request #3972 from matrix-org/jryans/missing-timeline-uisi
Check for timeline in pre-join UISI path
2020-01-29 14:04:45 +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
920daa3125 Get rid of custom enter handling and protect handlers, disabling button isn't foolproof
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:43:08 +00:00
Michael Telatynski
fe71fe6033 Sprinkle forms and new-password designators to make autofill and password completion less wild
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:38:50 +00:00
Michael Telatynski
cb0392b78d use forms to wrap password fields so Chrome doesn't go wild and prefill all the things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:24:45 +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
J. Ryan Stinnett
336f623aa9 Check for timeline in pre-join UISI path
Somehow, live events can be missing a timeline, even though that should not
happen... This restores @uhoreg's previous version where we test for this case.

Fixes https://github.com/vector-im/riot-web/issues/12120
2020-01-29 12:00:04 +00:00
Travis Ralston
45735d5ae3
Merge pull request #3970 from matrix-org/travis/user-lists/fix-paste
Let users paste text if they've already started filtering invite targets
2020-01-29 11:45:21 +00:00
Travis Ralston
e200988dbf
Merge pull request #3969 from matrix-org/travis/user-lists/suggestions
Filter event types when deciding on activity metrics for DM suggestions
2020-01-29 11:40:32 +00:00
Travis Ralston
95a78538e0
Break after getting timestamp 2020-01-29 11:23:48 +00:00
Travis Ralston
a138a66e77 Let users paste text if they've already started filtering invite targets
Fixes https://github.com/vector-im/riot-web/issues/11814
2020-01-29 11:22:03 +00:00
Travis Ralston
95edadbfa1
Merge pull request #3968 from matrix-org/travis/user-lists/autofocus
Automatically focus on the invite dialog input
2020-01-29 11:14:48 +00:00
Travis Ralston
8d12657483 Filter event types when deciding on activity metrics for DM suggestions
Fixes https://github.com/vector-im/riot-web/issues/12083
2020-01-29 11:14:33 +00:00
Travis Ralston
610354220e Automatically focus on the invite dialog input
Fixes https://github.com/vector-im/riot-web/issues/12070
2020-01-29 11:01:00 +00:00
David Baker
fa1f2cd7e0
Merge pull request #3966 from matrix-org/dbkr/restore_key_backup_in_complete_security
Restore key backup in Complete Security dialog
2020-01-29 09:55: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
83fdeeb180 Fix MemberInfo handling User objects without crashing 2020-01-29 07:53:23 +00:00
Michael Telatynski
2fbda42374 Fix buttons in right panel verif 2020-01-29 07:53:06 +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
c632c72f25 tidy up right-panel if-else-if statement 2020-01-28 23:43:09 +00:00
David Baker
4a26a72684 Restore key backup in Complete Security dialog
Fixes https://github.com/vector-im/riot-web/issues/11889
2020-01-28 22:46:21 +00:00
Michael Telatynski
7b5a8856a4 Passing refireParams actually prevented this from working 2020-01-28 22:06:04 +00:00
Hubert Chathi
793ff2cccc
Hide pre-join UTDs (#3881) 2020-01-28 15:36:24 -05:00
J. Ryan Stinnett
02ba548a62
Merge pull request #3963 from matrix-org/jryans/user-info-device-id
Add device IDs in user info tooltips
2020-01-28 20:05:43 +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
David Baker
de295cc350 Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login 2020-01-28 17:49:57 +00:00
Michael Telatynski
b002806639 Use DialogButtons because reusability :(( 2020-01-28 17:42:39 +00:00
Michael Telatynski
76e61b9948 Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 2020-01-28 17:19:59 +00:00
Michael Telatynski
58df4127d3 Update propTypes and remove todo 2020-01-28 17:14:48 +00:00
David Baker
abfa593791 Make the 'encryption upgrade' flow better
Fixes https://github.com/vector-im/riot-web/issues/12086
2020-01-28 16:36:07 +00:00
Half-Shot
bfaa9d56fb prefixes 2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684 Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty 2020-01-28 16:01:50 +00:00
Half-Shot
85bcad0ea0 Styling for Nad 2020-01-28 14:46:22 +00:00
J. Ryan Stinnett
a19cdc9077
Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s
Enable cross-signing lab when key in storage
2020-01-28 14:13:04 +00:00
J. Ryan Stinnett
9cf59ab16d Enable cross-signing lab when key in storage
When we're starting a new session and find the cross-signing keys in secret
storage, auto-enable the lab for the new session.

Fixes https://github.com/vector-im/riot-web/issues/12100
2020-01-28 12:30:41 +00:00
J. Ryan Stinnett
dea919f6ee
Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2
Add new session verification details dialog
2020-01-28 11:50:03 +00:00
Half-Shot
71233a5aff liney liney come back we need you 2020-01-28 11:33:51 +00:00
Half-Shot
7c0a461cbb Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty 2020-01-28 11:22:02 +00:00
Michael Telatynski
c93b080434 delint 2020-01-28 11:17:53 +00:00
Half-Shot
785277d4b8 Review bits for travis 2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b Apply remainder of ux 2020-01-28 11:13:09 +00:00
Zoe
06f7842afa
Merge pull request #3949 from matrix-org/foldleft/12079-fix-warnings-on-self
Fix issue where we don't notice if our own devices shouldn't be trusted
2020-01-28 10:16:27 +00:00
J. Ryan Stinnett
67358e06bf Use annotations and imports 2020-01-28 10:10:37 +00:00
Half-Shot
bdaf9fd06d i18n 2020-01-28 10:05:42 +00:00
J. Ryan Stinnett
6a9786e202
Merge pull request #3951 from matrix-org/jryans/comp-sec-body
Add separate component for post-auth security flows
2020-01-28 10:01:13 +00:00
J. Ryan Stinnett
d014c5239b Add new session verification details dialog
This gives more info on the session you're about to verify, including device
name and ID.

Fixes https://github.com/vector-im/riot-web/issues/11977
2020-01-27 23:16:26 +00:00
J. Ryan Stinnett
89f110f60a Add separate component for post-auth security flows
Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
2020-01-27 22:28:07 +00:00
J. Ryan Stinnett
f3fc95296e
Merge pull request #3944 from stoically/develop
Use https for recaptcha for all non-http protocols
2020-01-27 19:55:23 +00:00
stoically
ff195381e9
Use https for recaptcha for all non-http protocols
Signed-off-by: stoically <stoically@protonmail.com>
2020-01-27 18:56:55 +01: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
Zoe
1964e18315 Fix issue where we don't notice if our own devices shouldn't be trusted 2020-01-27 16:40:56 +00:00
Damir Jelić
e2dd2bd950 Merge branch 'poljar/seshat-ui-pr' into develop 2020-01-27 17:18:17 +01:00
Damir Jelić
ab8ea52266 EventIndexPanel: Make sure links get opened in a new tab. 2020-01-27 16:50:33 +01:00
Michael Telatynski
50b491d7e5 post merge fix 2020-01-27 15:48:19 +00:00
Michael Telatynski
ddb0f06005 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
2020-01-27 15:46:38 +00:00
Half-Shot
4d83288f4e linting 2020-01-27 14:42:46 +00:00
Half-Shot
c0d1298c4f Factor out into BridgeTile 2020-01-27 14:05:22 +00:00
Zoe
e224150190 detail pass on DMs 2020-01-27 12:17:12 +00:00
David Baker
1ab91d1d74
Merge pull request #3943 from matrix-org/dbkr/kill_lingering_verification_toast
Stop rogue verification toast if you verify during login
2020-01-27 11:17:55 +00:00
David Baker
6737523b1c
Merge pull request #3942 from matrix-org/dbkr/show_incoming_verifications_in_complete_security
Show incoming verification requests in the 'complete security' phase
2020-01-27 11:17:16 +00:00
David Baker
11de92b9a9 hopefully informative comment 2020-01-27 11:07:55 +00:00