David Baker
9ac4fa92fd
Update (bulk) unverified device toast copy
...
Fixes https://github.com/vector-im/riot-web/issues/13444
2020-04-29 15:31:41 +01:00
Weblate
5986edbbb2
Merge branch 'origin/develop' into Weblate.
2020-04-29 14:28:35 +00: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
Priit Jõerüüt
5b2ff19f59
Translated using Weblate (Estonian)
...
Currently translated at 20.5% (471 of 2298 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-04-29 14:28:35 +00:00
David Baker
1bd1e25047
Merge pull request #4519 from matrix-org/dbkr/new_device_toast_more_important
...
Make new device toasts appear above review toasts
2020-04-29 15:28:28 +01:00
J. Ryan Stinnett
65bdaa20b0
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 15:19:09 +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
Zoe
465442c31e
fragments and i18n don't play nice together
2020-04-29 15:13:24 +01:00
David Baker
325e1f9c4e
Add jsdoc explaining ordering behaviour
2020-04-29 15:10:23 +01:00
David Baker
1291a63b98
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 14:49:30 +01:00
Zoe
326d567468
Fixed the dialog height
2020-04-29 14:29:36 +01:00
Zoe
62c73146dc
copy changes
2020-04-29 14:14:39 +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
Weblate
70d94e2f7a
Merge branch 'origin/develop' into Weblate.
2020-04-29 11:09:42 +00:00
David Baker
eceb8edfbc
Merge pull request #4511 from matrix-org/dbkr/another_round_of_toast
...
Separate toasts for existing & new device verification
2020-04-29 12:09:37 +01:00
David Baker
0026e4a018
Comment typo
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-04-29 11:25:18 +01:00
Weblate
9f33e244f3
Merge branch 'origin/develop' into Weblate.
2020-04-29 10:10:52 +00:00
Jorik Schellekens
360cc332eb
Merge pull request #4477 from JorikSchellekens/joriks/toggle-bg-color
...
Slightly darker toggle off bg color
2020-04-29 11:10:47 +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
Weblate
205b6f8f54
Merge branch 'origin/develop' into Weblate.
2020-04-29 10:07:49 +00:00
Bruno Windels
8c28977c27
Merge pull request #4514 from JorikSchellekens/joriks/font-scaling-fixes
...
Fix pill vertical align
2020-04-29 10:07:44 +00:00
David Baker
126d81912b
Remove await for some more getStoredDevice() calls
2020-04-29 11:02:22 +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
Jorik Schellekens
2e7ccf6e7a
Fix pill vertical align
2020-04-29 10:57:35 +01:00
Weblate
ad6297bc8d
Merge branch 'origin/develop' into Weblate.
2020-04-29 09:57:29 +00:00
J. Ryan Stinnett
4adbfce92d
Merge pull request #4502 from matrix-org/jryans/set-up-button-text
...
Fix set up encryption toast to have use "set up" as action
2020-04-29 10:57:24 +01:00
David Baker
89a910c718
Clarify that we don't need tyo recheck
2020-04-29 10:55:44 +01:00
David Baker
75c680715f
s/unverified/new/
2020-04-29 10:53:36 +01:00
Weblate
f8464d03b5
Merge branch 'origin/develop' into Weblate.
2020-04-29 09:49:34 +00:00
Bruno Windels
d9469e6afe
Merge pull request #4509 from matrix-org/bwindels/dontencryptfor3pids
...
Don't enable e2ee when inviting a 3pid
2020-04-29 09:49:28 +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