Commit Graph

12860 Commits

Author SHA1 Message Date
David Baker 283a15c0b3 Lint 2020-04-29 15:54:32 +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
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
Zoe 465442c31e fragments and i18n don't play nice together 2020-04-29 15:13:24 +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 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 126d81912b Remove await for some more getStoredDevice() calls 2020-04-29 11:02:22 +01: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
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
David Baker 6f25f2eaec Add the other toast component 2020-04-29 10:44:51 +01:00
Bruno Windels bb6d13781c enable encryption when NOT inviting 3pids 2020-04-29 11:40:04 +02:00
Michael Telatynski 41dece38a4 iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-29 10:35:35 +01:00
Jorik Schellekens f7b3662e0b Fully appease prop types 2020-04-29 10:32:05 +01:00
Bruno Windels f06a69d8cc targets can also contain RoomMember, so take the positive case rather 2020-04-29 11:05:35 +02:00
Bruno Windels 4e98b5b4b6 dont enable e2ee when inviting a 3pid 2020-04-29 11:05:35 +02:00
Jorik Schellekens 2acb1663eb Appease the prop types 2020-04-29 01:01:56 +01:00
David Baker 719faed2ff 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-28 18:35:16 +01:00
Michael Telatynski 32c512dbfe Fix internal link styling in Security Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-28 17:49:10 +01:00
Bruno Windels d723aa9efe Merge pull request #4508 from matrix-org/bwindels/moarthemingfixes
Small custom theming fixes
2020-04-28 15:25:53 +00:00
Jorik Schellekens af8430b98a Inverted boolean 2020-04-28 15:48:54 +01:00
Jorik Schellekens 1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Bruno Windels 198edb06b9 use normal accessible button, which is themed 2020-04-28 16:35:20 +02:00
Jorik Schellekens fe326b9f08 Enfore function name capitalisation 2020-04-28 14:31:49 +01:00
Jorik Schellekens 57d880ca5e Use correct name and indentation 2020-04-28 14:24:44 +01:00
Jorik Schellekens 175b5e70b6 Lint Slider 2020-04-28 14:20:49 +01:00
Jorik Schellekens 137b94703a Lint types 2020-04-28 14:20:49 +01:00
Jorik Schellekens c268b98ded Use faster lookup method
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-28 14:17:50 +01:00
Jorik Schellekens a8407c9508 Use purecomponent
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-28 14:00:15 +01:00
Jorik Schellekens cf05beb4b8 Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
2020-04-28 13:47:50 +01:00
Zoe 9d1c73348c Show progress when loading keys 2020-04-28 11:32:51 +01:00
David Baker 60d51a0f1e Merge pull request #4506 from matrix-org/dbkr/aggregate_device_verify_toasts
Aggregate device verify toasts
2020-04-28 11:00:52 +01:00
David Baker 4dca66d140 No need for this if statement now 2020-04-28 09:43:24 +01:00
Pauli Virtanen 38962560ac Style fixes
Signed-off-by: Pauli Virtanen <pav@iki.fi>
2020-04-28 02:29:20 +03:00
Michael Telatynski 3e35cffae7 null-guards
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:53:32 +01:00
Michael Telatynski a5830c229e more tidying
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:30:40 +01:00
Michael Telatynski c7870090f8 clean ups
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:29:38 +01:00
Michael Telatynski 83a4558d49 remove RedactedGrouper for now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:27:46 +01:00
Michael Telatynski a399b1018a fix flashing by ""
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:16:08 +01:00
Michael Telatynski 9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
David Baker 7e956514a2 Lint 2020-04-27 20:35:39 +01:00
David Baker ff1fd15e72 Use the New Session review dialog for verifying our own devices 2020-04-27 20:31:14 +01:00
J. Ryan Stinnett b396096cd2 Fix set up encryption toast to have 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-27 18:35:51 +01:00
David Baker a5ee99b858 Aggregate device verification toasts into one toast
'Review' now opens the only place we can verify our own devices:
our user info.
2020-04-27 18:33:54 +01:00
Jorik Schellekens 00c0212c03 Revert previous fix 2020-04-27 17:35:52 +01:00
Jorik Schellekens c995e2e021 Fix info avatar 2020-04-27 17:29:03 +01:00
Jorik Schellekens b567b95fad Lint 2020-04-27 17:27:54 +01:00
Jorik Schellekens bfba5e6cfe Fix member info avatar size 2020-04-27 16:57:38 +01:00
David Baker 5d4aa03c8e Lint 2020-04-27 14:43:17 +01:00
David Baker 03d89361cd Update to (almost) match design 2020-04-27 14:35:32 +01:00