OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
24,084 Commits
219 Branches
561 Tags
440 MiB
Commit Graph

24084 Commits (b809be11c02c1a74a2718dbfabca77181d7b0117)

Author SHA1 Message Date
David Baker 683d6804ca Update toast copy again 
Fixes https://github.com/vector-im/riot-web/issues/13447
 2020-04-29 19:07:10 +01:00
Priit Jõerüüt cea8f59fb3 Translated using Weblate (Estonian) 
Currently translated at 23.7% (545 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 17:48:46 +00: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
Weblate ddb4aec5ed Merge branch 'origin/develop' into Weblate. 2020-04-29 17:08:20 +00:00
David Baker c58bb2af0f
Merge pull request #4525 from matrix-org/dbkr/longtoast_is_no_longer_long 
Reduce maximum width of toasts & allow multiple lines
 2020-04-29 18:08:15 +01:00
Priit Jõerüüt 1cac7b778d Translated using Weblate (Estonian) 
Currently translated at 22.3% (513 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 17:05:12 +00:00
Bruno Windels 886b30a265 also recheck 2020-04-29 18:55:25 +02: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
Weblate b46415ce62 Merge branch 'origin/develop' into Weblate. 2020-04-29 16:42:22 +00:00
David Baker 3502b90aeb
Merge pull request #4524 from matrix-org/dbkr/sessions_there_on_login_are_old 
Treat sessions that are there when we log in as old
 2020-04-29 17:42:16 +01:00
Weblate eca1187c2e Merge branch 'origin/develop' into Weblate. 2020-04-29 16:41:45 +00:00
Louis 1f79f5ded6 Translated using Weblate (French) 
Currently translated at 99.9% (2298 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-29 16:41:44 +00:00
Priit Jõerüüt eebcf748e1 Translated using Weblate (Estonian) 
Currently translated at 22.2% (510 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 16:41:44 +00:00
J. Ryan Stinnett 0e371b65d1
Merge pull request #4521 from matrix-org/jryans/reset-from-access 
Allow resetting storage from the access dialog
 2020-04-29 17:41:35 +01:00
David Baker 34d6eb591f Put overflows back 2020-04-29 17:38:32 +01:00
David Baker c41af152ac
Comment typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-04-29 17:33:18 +01:00
David Baker 13d0e26ec4 Reduce maximum width of toasts & allow multiple lines 2020-04-29 17:28:45 +01:00
David Baker a70efea69e 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:16:04 +01:00
Weblate 5fd81ab6d4 Merge branch 'origin/develop' into Weblate. 2020-04-29 15:02:59 +00: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 dfb34a2e76
Merge pull request #4522 from matrix-org/dbkr/toast_copy_again 
Update (bulk) unverified device toast copy
 2020-04-29 16:02:53 +01:00
David Baker d691386ef0 Lint 2020-04-29 15:56:01 +01:00
David Baker 283a15c0b3 Lint 2020-04-29 15:54:32 +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 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