OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,732 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

23732 Commits (bc6aeef8241a5d7e2ace44a7ddaa82230b1b83db)

Author SHA1 Message Date
David Baker bc6aeef824 Guard against race when waiting for cross-signing to be ready 
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
 2020-05-01 10:58:00 +01:00
David Baker bff2130b2d
Merge pull request #4537 from matrix-org/dbkr/wait_for_user_verified 
Wait for user to be verified in e2e setup
 2020-05-01 10:41:22 +01:00
David Baker 064d90c4b5 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_user_verified 2020-04-30 22:27:39 +01:00
David Baker d241ceea56 Clear more state in DeviceListener 
Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
 2020-04-30 22:21:48 +01:00
David Baker 124740a63c Wait for user to be verified in e2e setup 
Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.

Fixes part of https://github.com/vector-im/riot-web/issues/13464
 2020-04-30 22:08:00 +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 c7e663832a
Merge pull request #4535 from matrix-org/dbkr/a_toast_to_you_sir 
Add device name to unverified session toast
 2020-04-30 16:37:04 +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 e210f570f0
Merge pull request #4532 from matrix-org/dbkr/remove_unnecessary_return 
Fix device verification toasts not disappearing
 2020-04-30 11:13:14 +01:00
David Baker e845409167 Fix device verification toasts not disappearing 
recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself).
 2020-04-30 11:00:35 +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 5ecd874e82 yarn i18n 2020-04-30 09:44:15 +01:00
Bruno Windels 00d7e77379
Merge pull request #4518 from matrix-org/bwindels/recheckthemeonlogin 
Re-apply theme after login
 2020-04-30 08:26:15 +00: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
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
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 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
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 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
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
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 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
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
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
Jorik Schellekens 2e7ccf6e7a Fix pill vertical align 2020-04-29 10:57:35 +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
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
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 90b0223fbd
Merge pull request #4510 from matrix-org/t3chguy/settings_link_styling 
Fix internal link styling in Security Settings
 2020-04-29 10:26:25 +01:00