mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
23350 commits 207 branches 547 tags 609 MiB
Commit graph

23350 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
5a29bf569d Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:21:33 +01:00
David Baker
19d0bf0d3b
Merge pull request #4533 from matrix-org/dbkr/remove_unnecessary_return_rel 
Fix device verification toasts not disappearing
 2020-04-30 11:13:21 +01:00
David Baker
4f95c89ffc Fix device verification toasts not disappearing 
recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself).
 2020-04-30 11:05:31 +01:00
J. Ryan Stinnett
db36b7e1d5
Merge pull request #4526 from matrix-org/jryans/reset-from-access-rc 
Allow resetting storage from the access dialog
 2020-04-30 10:17:12 +01:00
David Baker
3d996a91a7
Merge pull request #4530 from matrix-org/dbkr/toast_copy_update_again_rel 
Update toast copy again
 2020-04-30 10:01:25 +01:00
David Baker
aa9da54bed yarn i18n 2020-04-30 09:45:11 +01:00
David Baker
c97eab24c7 Update toast copy again 
Fixes https://github.com/vector-im/riot-web/issues/13447
 2020-04-29 19:08:08 +01:00
David Baker
7af2d27ced
Merge pull request #4528 from matrix-org/dbkr/longtoast_is_no_longer_long_rel 
Reduce maximum width of toasts & allow multiple lines
 2020-04-29 18:14:26 +01:00
David Baker
6b04ae2cf6
Merge pull request #4527 from matrix-org/dbkr/sessions_there_on_login_are_old_rel 
Treat sessions that are there when we log in as old
 2020-04-29 18:14:19 +01:00
David Baker
189a78d184 Put overflows back 2020-04-29 18:08:54 +01:00
David Baker
ba233dc372 Reduce maximum width of toasts & allow multiple lines 2020-04-29 18:08:48 +01:00
David Baker
38124ba9d0 Comment typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-04-29 17:45:35 +01:00
David Baker
19170945b1 Treat sessions that are there when we log in as old 
Use the bulk 'review' toast for sessions that existed at the time
of login, rather than considering them all to be new.

Also cheeky unrelated proptypes fix.

Fixes https://github.com/vector-im/riot-web/issues/13443
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1360
 2020-04-29 17:45:28 +01:00
J. Ryan Stinnett
e3da750de0 Allow resetting storage from the access dialog 
This adds a path to reset secret storage from the access dialog instead of
throwing an error.

Fixes https://github.com/vector-im/riot-web/issues/13436
 2020-04-29 17:43:05 +01:00
David Baker
de9c8b0537
Merge pull request #4523 from matrix-org/dbkr/toast_copy_again_rel 
Update (bulk) unverified device toast copy
 2020-04-29 16:02:56 +01:00
David Baker
d691386ef0 Lint 2020-04-29 15:56:01 +01:00
David Baker
691066af94 Update (bulk) unverified device toast copy 
Fixes https://github.com/vector-im/riot-web/issues/13444
 2020-04-29 15:32:56 +01:00
David Baker
33390e3659
Merge pull request #4520 from matrix-org/dbkr/new_device_toast_more_important_rel 
Make new device toasts appear above review toasts
 2020-04-29 15:28:35 +01:00
David Baker
58c0cfe315 Add jsdoc explaining ordering behaviour 2020-04-29 15:18:49 +01:00
David Baker
e9214f7d13 Make new device toasts appear above review toasts 
...but below incoming verification toasts, which means we now need
to actually handle priority insertion correctly. Oh well.

Fixes https://github.com/vector-im/riot-web/issues/13442
 2020-04-29 15:18:43 +01:00
David Baker
87669f4ff7
Merge pull request #4517 from matrix-org/dbkr/another_round_of_toast_rel 
Separate toasts for existing & new device verification
 2020-04-29 12:50:06 +01:00
David Baker
dfc1c5e627
Merge pull request #4516 from matrix-org/dbkr/aggregate_device_verify_toasts_rel 
Aggregate device verify toasts
 2020-04-29 12:49:50 +01:00
David Baker
5eb86c0d6a Comment typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-04-29 12:37:34 +01:00
David Baker
690e934b27 Remove await for some more getStoredDevice() calls 2020-04-29 12:37:29 +01:00
David Baker
8aa5d762db Clarify that we don't need tyo recheck 2020-04-29 12:37:22 +01:00
David Baker
e67faa15ca s/unverified/new/ 2020-04-29 12:37:17 +01:00
David Baker
9cbc407305 Add the other toast component 2020-04-29 12:37:10 +01:00
David Baker
0f9d3f555e Separate toasts for existing & new device verification 
Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.

Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).

Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
 2020-04-29 12:37:05 +01:00
David Baker
81d91721d8 Consts are constant 2020-04-29 12:35:23 +01:00
David Baker
f7c881a462 No need for this if statement now 2020-04-29 12:35:17 +01:00
David Baker
7da2850a2e No need for a set here - bool is fine 2020-04-29 12:35:11 +01:00
David Baker
3e6a623270 Lint 2020-04-29 12:35:02 +01:00
David Baker
996f8af365 Use the New Session review dialog for verifying our own devices 2020-04-29 12:34:54 +01:00
David Baker
0edb80e541 Make close button work from user info view 
Adds more hacks so that the close button does something vagauely
plausible in all situations.
 2020-04-29 12:34:48 +01:00
David Baker
e5d06b1acb Aggregate device verification toasts into one toast 
'Review' now opens the only place we can verify our own devices:
our user info.
 2020-04-29 12:34:43 +01:00
J. Ryan Stinnett
698a539866
Merge pull request #4515 from matrix-org/jryans/set-up-button-text-rc 
Fix set up encryption toast to use "set up" as action
 2020-04-29 11:09:09 +01:00
Michael Telatynski
bdeb788be9
Merge pull request #4512 from matrix-org/t3chguy/cherry-pick/4 
Fix internal link styling in Security Settings
 2020-04-29 10:59:24 +01:00
J. Ryan Stinnett
736857ffdf Fix set up encryption toast to use "set up" as action 
This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.

Fixes https://github.com/vector-im/riot-web/issues/13231
 2020-04-29 10:58:55 +01:00
Bruno Windels
da52a16ff4
Merge pull request #4513 from matrix-org/bwindels/dontencryptfor3pids-rc 
Don't enable e2ee when inviting a 3pid
 2020-04-29 09:58:38 +00:00
Bruno Windels
c10969f520 enable encryption when NOT inviting 3pids 2020-04-29 11:46:04 +02:00
Bruno Windels
a8205d21f1 targets can also contain RoomMember, so take the positive case rather 2020-04-29 11:46:04 +02:00
Bruno Windels
be13e86b09 dont enable e2ee when inviting a 3pid 2020-04-29 11:46:04 +02:00
Michael Telatynski
dc7b588e02 fix font-size 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-29 10:29:33 +01:00
Michael Telatynski
246c70c6a1 Fix internal link styling in Security Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-29 10:29:32 +01:00
Michael Telatynski
98b418a809
Merge pull request #4505 from matrix-org/t3chguy/cherry-pick/2 
only clear on continuations where the clear isn't done by SenderProfile
 2020-04-27 19:20:16 +01:00
Michael Telatynski
cf6dbcc71b
Merge pull request #4504 from matrix-org/t3chguy/cherry-pick/3 
cap width of editable item list item to leave space for its X button
 2020-04-27 18:57:23 +01:00
Michael Telatynski
de3226177c cap width of editable item list item to leave space for its X remove button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 18:51:07 +01:00
Michael Telatynski
1a99917556 only clear on continuations where the clear isn't done by SenderProfile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 18:50:18 +01:00
David Baker
582747d2ed
Merge pull request #4499 from matrix-org/dbkr/link_from_settings_to_userprofile_rel 
Add a link from settings / devices to your user profile
 2020-04-27 17:28:46 +01:00
David Baker
63d2d128c5 Lint 2020-04-27 16:29:28 +01:00