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

54 commits

Author SHA1 Message Date
David Baker
bce22c620f Don't show spinner over encryption setup dialogs 
Fixes https://github.com/vector-im/riot-web/issues/13051
 2020-04-07 13:08:18 +01:00
Bruno Windels
364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
David Baker
8a64caa925 Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy 2020-03-26 11:14:33 +00:00
David Baker
95828ce751 Remove duplicate import 2020-03-26 11:13:57 +00:00
David Baker
8532c72fce Update copy on SSSS symmetric upgrade toast 
Fixes https://github.com/vector-im/riot-web/issues/12881
 2020-03-26 11:12:00 +00:00
David Baker
4586971a82 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete 2020-03-26 11:10:07 +00:00
David Baker
be50f80314 Wait for SSSS upgrade to complete 
and show a spinner while it completes
 2020-03-24 19:02:57 +00:00
Bruno Windels
3e59127d12 use SetupEncryptionBody to show a dialog from "Verify this session" 2020-03-24 16:39:43 +01:00
Bruno Windels
13a4f4190f Revert "also enable 4s when accepting a verification request" 
This reverts commit ab2e3a3465.
 2020-03-11 10:11:54 +01:00
Bruno Windels
ab2e3a3465 also enable 4s when accepting a verification request 2020-03-10 16:54:49 +01: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
Bruno Windels
569d5b6156 show right panel before waiting for .ready event to send 2020-02-25 13:13:31 +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
Bruno Windels
3ec0301f9d use canAccept in toast, which takes local echo into account 2020-02-13 17:28:10 +01:00
Bruno Windels
1ff1575b42 remove dead code 2020-02-10 16:59:47 +01: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
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
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
J. Ryan Stinnett
02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
Zoe
36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +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
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