Commit Graph

23336 Commits (de9c8b053778e0be877ef995a05a80b7a1a3b874)

Author SHA1 Message Date
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
David Baker d6f96f2f27 Update i18n 2020-04-27 16:29:22 +01:00
David Baker ef1e40c839 Update to (almost) match design 2020-04-27 16:29:17 +01:00
David Baker 0a89813de1 Add a link from settings / devices to your user profile
Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
2020-04-27 16:29:11 +01:00
David Baker 4e0f0bb299
Merge pull request #4490 from matrix-org/dbkr/setup_encryption_dialog_icon_rel
Make icon change in SetupEncryptionDialog
2020-04-24 18:56:22 +01:00
Travis Ralston 477875e012
Merge pull request #4488 from matrix-org/travis/release/labs-remove-padlocks
Remove invite only padlocks feature flag for release
2020-04-24 10:48:46 -06:00
David Baker cb4030f0c2
Merge pull request #4489 from matrix-org/dbkr/correct_toast_rel
Fix incorrect toast if security setup skipped
2020-04-24 17:40:33 +01:00
David Baker b3fac7c2cb Move store subscribe to didmount 2020-04-24 17:40:21 +01:00
David Baker c684898ba0 Make icon change in SetupEncryptionDialog
Fixes https://github.com/vector-im/riot-web/issues/13368
2020-04-24 17:40:14 +01:00
David Baker d550f6c564 Fix incorrect toast if security setup skipped
DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

Fixes https://github.com/vector-im/riot-web/issues/13372
2020-04-24 17:33:31 +01:00
Travis Ralston 353810ce63 Remove invite only padlocks feature flag
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
2020-04-24 10:06:34 -06:00
Michael Telatynski 7b9c46a5a9
Merge pull request #4483 from matrix-org/t3chguy/cherry-pick/1
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
2020-04-24 13:45:15 +01:00
Michael Telatynski 42a857cb5e Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
(cherry picked from commit 972f9d354d)
2020-04-24 13:24:54 +01:00
J. Ryan Stinnett dd532d5a6c
Merge pull request #4480 from matrix-org/jryans/login-recovery-link-release
Fix recovery link on login verification flow
2020-04-23 18:24:55 +01:00
J. Ryan Stinnett 949b916091 Fix recovery link on login verification flow
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
2020-04-23 18:18:25 +01:00