b95d533c4a
Merge pull request #4573 from matrix-org/t3chguy/remove_recent_self
...
Don't try and redact redactions for "Remove recent messages"
2020-05-12 09:43:23 +01:00
aacc582b52
Merge pull request #4571 from matrix-org/t3chguy/view_source_edits
...
View Source should target the replacing event rather than the root one
2020-05-12 09:43:02 +01:00
03fce86699
Merge pull request #4569 from matrix-org/dbkr/key_backup_restore_reset_recovery
...
Fix passphrase reset in key backup restore dialog
2020-05-12 09:22:08 +01:00
58a5b7f154
Merge pull request #4556 from matrix-org/travis/fix-reset
...
Ensure key backup gets dealt with correctly during secret storage reset
2020-05-11 14:30:12 -06:00
c0061e2f2a
Don't try and redact redactions for "Remove recent messages"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-11 16:39:14 +01:00
0e8bd59d2f
View Source should target the replacing event rather than the root one
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-11 15:43:34 +01:00
6486c74909
Fix passphrase reset in key backup restore dialog
...
We prompt to restore the key backup when bootstrapping if it's not
trusted, but the 'set up new recovery options' in this dialog just
sets up a new key backup which just goes back to trying to access
SSSS if cross-signing is enabled. This makes it reset the SSSS
passphase instead.
Fixes https://github.com/vector-im/riot-web/issues/13578
2020-05-11 14:21:59 +01:00
67844d9e1d
Merge pull request #4564 from matrix-org/t3chguy/redaction_redesign
...
Bring back UnknownBody for UISIs
2020-05-11 10:10:59 +01:00
0da8ef6a1e
Merge pull request #4560 from matrix-org/t3chguy/redact_file
...
Close ImageView when redacting
2020-05-11 10:10:25 +01:00
6ff093f5a3
Bring back UnknownBody for UISIs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-08 19:15:59 +01:00
347e3a0dd0
Merge pull request #4484 from matrix-org/t3chguy/redaction_redesign
...
Redesign redactions
2020-05-08 17:40:04 +01:00
5402839f30
Close ImageView when
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-05-08 00:15:48 +01:00
2aa7a6087c
Merge pull request #4547 from matrix-org/travis/fix-user-panel
...
Don't try to reload profile information when closing the user panel
2020-05-07 10:21:17 -06:00
dc65c87752
Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign
2020-05-07 17:10:21 +01:00
1abd729ce0
Merge pull request #4540 from matrix-org/foldleft/11395-reg-error
...
Don't erase password confirm on registration error
2020-05-07 10:42:21 +01:00
f0085a9feb
Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign
2020-05-07 09:56:21 +01:00
9ae812c346
Add a loading state for email addresses/phone numbers in settings
...
Fixes https://github.com/vector-im/riot-web/issues/13432
2020-05-06 15:17:55 -06:00
e5da81b6ba
Ensure key backup gets dealt with correctly during secret storage reset
...
Fixes https://github.com/vector-im/riot-web/issues/13562
We only initialize a new key backup if the user requested one. If they've requested new keys but have not asked for keys to be backed up, we simply delete the now-invalid backup.
This also adds some logging to identify in rageshakes when someone resets their cross-signing, and when their key backup is being deleted.
2020-05-06 14:42:03 -06:00
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy
...
Update Invite Dialog copy to include email addresses
2020-05-06 18:16:36 +01:00
14516d3e7e
Merge pull request #4552 from matrix-org/foldleft/fix-sublist-crash
...
Fix a crash where a name could unexpectedly be an empty list
2020-05-06 13:52:50 +01:00
781cbea744
Fix a crash where a name could unexpectedly be an empty list
2020-05-05 15:39:37 +01:00
9a14417a03
Don't try to reload profile information when closing the user panel
...
Fixes https://github.com/vector-im/riot-web/issues/13479
This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.
Instead of debugging it too much further, we'll just patch around it.
This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
2020-05-04 15:41:26 -06:00
6e99faefde
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into comunities-drag-from-context
2020-05-02 13:40:57 +02:00
baa9cd8078
formatted files
2020-05-02 13:25:18 +02:00
a84a3c4780
hide badge when context menu is open
2020-05-02 13:12:31 +02:00
fc5a5c411f
provided.placeholder has no effect
2020-05-02 13:09:04 +02:00
01131a4036
removed unnecessary divs
2020-05-02 12:55:56 +02:00
8a02e064bd
Don't erase password confirm on registration error
...
Fixes: https://github.com/vector-im/riot-web/issues/11395
Problem here was that the form gets re-mounted but there wasn't a facility
to preserve the password confirmation field. Since the form validates
that the passwords are equal, if we mount with a password supplied we
just copy it over.
2020-05-01 11:03:48 +01:00
3240b3bd60
Add device name to unverified session toast
2020-04-30 16:09:38 +01:00
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
683d6804ca
Update toast copy again
...
Fixes https://github.com/vector-im/riot-web/issues/13447
2020-04-29 19:07:10 +01:00
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
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
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
283a15c0b3
Lint
2020-04-29 15:54:32 +01:00
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
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
465442c31e
fragments and i18n don't play nice together
2020-04-29 15:13:24 +01:00
326d567468
Fixed the dialog height
2020-04-29 14:29:36 +01:00
62c73146dc
copy changes
2020-04-29 14:14:39 +01:00
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
126d81912b
Remove await for some more getStoredDevice() calls
2020-04-29 11:02:22 +01:00
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
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
6f25f2eaec
Add the other toast component
2020-04-29 10:44:51 +01:00
bb6d13781c
enable encryption when NOT inviting 3pids
2020-04-29 11:40:04 +02:00
41dece38a4
iterate copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-04-29 10:35:35 +01:00
f06a69d8cc
targets can also contain RoomMember, so take the positive case rather
2020-04-29 11:05:35 +02:00
4e98b5b4b6
dont enable e2ee when inviting a 3pid
2020-04-29 11:05:35 +02:00
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