Commit Graph

10259 Commits

Author SHA1 Message Date
Zoe 781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
Michael Telatynski c19338b1d3 Merge pull request #4462 from matrix-org/t3chguy/app_load4
Convert MatrixChat to a TypeScript class
2020-04-30 17:48:42 +01:00
Michael Telatynski 9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4
 Conflicts:
	src/components/structures/MatrixChat.tsx
2020-04-30 17:41:14 +01:00
Travis Ralston 7b775a8d93 Merge pull request #4271 from aaronraimist/esc-mark-as-read
Mark room as read when escape is pressed
2020-04-30 10:40:50 -06:00
J. Ryan Stinnett e56ce8d885 Merge pull request #4534 from matrix-org/jryans/key-backup-network-fail
Only show key backup reminder when confirmed by server to be missing
2020-04-30 17:21:13 +01:00
David Baker 3240b3bd60 Add device name to unverified session toast 2020-04-30 16:09:38 +01:00
J. Ryan Stinnett d3ce4072d4 Only show key backup reminder when confirmed by server to be missing
The key backup reminder was being shown too eagerly in cases when we hadn't
actually checked with the homeserver on key backup status. This changes to only
show the reminder when we're sure a backup doesn't exist.

Fixes https://github.com/vector-im/riot-web/issues/13404
2020-04-30 15:41:49 +01:00
Zoe 3acb952d9a Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress
Show progress when loading keys
2020-04-30 14:09:47 +01:00
David Baker 0eb39d8756 Merge pull request #4529 from matrix-org/dbkr/toast_copy_update_again
Update toast copy again
2020-04-30 10:01:16 +01:00
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
Bruno Windels 886b30a265 also recheck 2020-04-29 18:55:25 +02: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
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 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
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
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
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
Bruno Windels 198edb06b9 use normal accessible button, which is themed 2020-04-28 16:35:20 +02: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
Michael Telatynski 2792988ad1 Revert "Make Screens an enum"
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:59:07 +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 3bdd24ce83 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-27 18:34:48 +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
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
David Baker ca0cede1aa 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 14:25:47 +01:00
Jorik Schellekens b4dcd50d56 Use camel case on import 2020-04-27 11:51:56 +01:00
Jorik Schellekens c3ba7a8c91 Tweak read receipt remainder text 2020-04-27 11:51:56 +01:00