Commit Graph

16504 Commits

Author SHA1 Message Date
Travis Ralston ccde5530d2 Add reciprocate as a method 2020-02-10 17:34:45 +01:00
Travis Ralston afc38b92a0 Always send scan for RiotX (for now) 2020-02-10 17:33:19 +01:00
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