mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 21:11:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
24391 commits 219 branches 562 tags 474 MiB
Commit graph

10354 commits

Author SHA1 Message Date
Travis Ralston
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
Michael Telatynski
c2dcb60f0b Prompt user to specify an alternate server if their chosen one has registration disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 20:10:45 +01:00
Michael Telatynski
f02ce176dd Merge branches 'develop' and 'matthew/invite-npe' of github.com:matrix-org/matrix-react-sdk into matthew/invite-npe 2020-05-11 17:05:17 +01:00
Michael Telatynski
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
Michael Telatynski
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
David Baker
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
Michael Telatynski
67844d9e1d
Merge pull request #4564 from matrix-org/t3chguy/redaction_redesign 
Bring back UnknownBody for UISIs
 2020-05-11 10:10:59 +01:00
Michael Telatynski
0da8ef6a1e
Merge pull request #4560 from matrix-org/t3chguy/redact_file 
Close ImageView when redacting
 2020-05-11 10:10:25 +01:00
Matthew Hodgson
ad2f704e76 don't NPE on invites from Dendrite 2020-05-10 11:17:21 +01:00
Michael Telatynski
6ff093f5a3 Bring back UnknownBody for UISIs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-08 19:15:59 +01:00
Michael Telatynski
347e3a0dd0
Merge pull request #4484 from matrix-org/t3chguy/redaction_redesign 
Redesign redactions
 2020-05-08 17:40:04 +01:00
Michael Telatynski
5402839f30 Close ImageView when 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-08 00:15:48 +01:00
Travis Ralston
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
Michael Telatynski
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
Zoe
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
Michael Telatynski
7c1ac7aaff fix unrelated tautology 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-07 10:02:40 +01:00
Michael Telatynski
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
b8fd50c5e3 Appease the linter 2020-05-06 14:27:32 -06:00
Travis Ralston
d31a0199bc Add default dialog aesthetics to avoid empty SSO dialogs in future 2020-05-06 14:24:16 -06:00
Michael Telatynski
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
Zoe
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
Zoe
781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
Travis Ralston
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
Agusti Bau
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
Agusti Bau
baa9cd8078 formatted files 2020-05-02 13:25:18 +02:00
Agusti Bau
a84a3c4780 hide badge when context menu is open 2020-05-02 13:12:31 +02:00
Agusti Bau
fc5a5c411f provided.placeholder has no effect 2020-05-02 13:09:04 +02:00
Agusti Bau
01131a4036 removed unnecessary divs 2020-05-02 12:55:56 +02:00
Zoe
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
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
Michael Telatynski
41dece38a4 iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-29 10:35:35 +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
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
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
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
Michael Telatynski
a58fd6c475 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 14:27:41 +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
Michael Telatynski
606940bd77 Update Invite Dialog copy to include email addresses 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 14:07:39 +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
Jorik Schellekens
cef6868f02 Resize room list scroll section. 
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
 2020-04-27 11:51:55 +01:00
Jorik Schellekens
ff1544b783 Fix read receipt horizontal spacing at scale 2020-04-27 11:51:54 +01:00
Jorik Schellekens
3f56ed393d Use a function to convert to rem. 2020-04-27 11:51:54 +01:00
Jorik Schellekens
e2aef3a62b Fix pills. 
This was a hard pill to swallow
 2020-04-27 11:51:54 +01:00
Agusti Bau
98a949bed1 Refactored DNDTagTile to use useContextMenu 
Signed-off-by: Agusti Bau <agustibau@gmail.com>
 2020-04-26 18:54:35 +02:00
Agusti Bau
5f3e3b3ec2 Extracted context menu from TagTile to DNDTagTile 2020-04-25 01:09:07 +02:00
David Baker
121ac14273
Merge pull request #4485 from matrix-org/dbkr/setup_encryption_dialog_icon 
Make icon change in SetupEncryptionDialog
 2020-04-24 18:56:40 +01:00
David Baker
6460f6303c Move store subscribe to didmount 2020-04-24 17:36:02 +01:00
Travis Ralston
117322b3b5 Remove invite only padlocks feature flag 
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
 2020-04-24 10:05:28 -06:00
David Baker
bbce37b92f Make icon change in SetupEncryptionDialog 
Fixes https://github.com/vector-im/riot-web/issues/13368
 2020-04-24 15:39:54 +01:00
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:39:23 +01:00