OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
27,948 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

80 Commits (5e627c34eb07d856b1377a9bd96838111c2a5bc9)

Author SHA1 Message Date
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
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 c4f1659116 don't dismiss toasts for device verification 
as they are immediately started
 2020-01-29 15:27:26 +01: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 c93b080434 delint 2020-01-28 11:17:53 +00:00
J. Ryan Stinnett 67358e06bf Use annotations and imports 2020-01-28 10:10:37 +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
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
David Baker f851f976e7 Stop rogue verification toast if you verify during login 
Fixes https://github.com/vector-im/riot-web/issues/12057
 2020-01-25 21:26:43 +00:00
David Baker 8c5fd5c77e Verification nag toasts 
Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.

Fixes https://github.com/vector-im/riot-web/issues/11220
 2020-01-25 16:52:12 +00: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
Bruno Windels 512bd4b0b2 show to_device verification in dialog, not right panel 
this also makes it work again, as the VerificationPanel doens't
know how to deal with requests that are already in PHASE_STARTED,
which was breaking verifying your own devices.
 2020-01-24 11:59:17 +01:00
Bruno Windels 2483337e89 don't use removed .event property anymore on verification request 2020-01-24 11:59:01 +01:00
Bruno Windels 716c8ba68f pr feedback 2020-01-17 17:02:31 +01:00
Bruno Windels 5556cb5749 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-17 16:02:51 +01:00
David Baker 9e43abaf3a Toasts for new, unverified sessions 
Fixes https://github.com/vector-im/riot-web/issues/11218
 2020-01-17 11:43:35 +00:00
David Baker 83b1505401 Add a ToastStore 
To store toast. Rather than them being stored in the state of the
ToastContainer component, they now have a dedicated store. This mostly
fixes problems involving showing toasts when the app loaded because
we would otherwise have a race condition where something tries to
show a toast before the ToastContainer is mounted.
 2020-01-16 20:23:47 +00:00
Travis Ralston d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -07:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Bruno Windels 7a88a94936 fixes! 2020-01-03 13:50:13 +01:00
Bruno Windels dd633bd8fe port toast to use VerificationRequest and open right panel, not dialog 2020-01-03 13:50:13 +01:00
Travis Ralston 042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston 806d728d59 Import from the js-sdk's src/ directory 
Because ES6 and such.
 2019-12-22 21:14:33 -07:00
Travis Ralston d56f0f2a25 Convert many imports to handle ES6 exports 
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
 2019-12-22 21:04:42 -07:00
J. Ryan Stinnett 3ac0deebab Use static modals for verification 
Verification with cross-signing may requiring asking for your secret storage
passphrase, which is displayed in it's own modal on top of flows. For now while
verification takes in modals also, mark the verification ones as static so they
don't lose state when secret storage appears on top mid-flow.
 2019-12-13 13:55:28 +00:00
Bruno Windels 422ab81185 a11y adjustments for toasts 2019-11-25 12:31:57 +01:00
Bruno Windels c705752317 add toast for verification requests 
this uses a verification requests as emitted by the js-sdk with
the `crypto.verification.request` rather than a verifier as emitted
by `crypto.verification.start` as this works for both to_device and
timeline events with the changes made in the js-sdk pr.
 2019-11-22 16:08:27 +01:00