mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 10:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
25147 commits 219 branches 562 tags 474 MiB
Commit graph

249 commits

Author SHA1 Message Date
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Michael Telatynski
8848a2ea64 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/InviteDialog.js
 2020-06-01 21:42:31 +01:00
Michael Telatynski
2b432b0d82 Remove feature_cross_signing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:28:25 +01:00
Michael Telatynski
0016d8e744 Add e2ee_default_for_private_rooms to control default e2ee behaviour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-19 11:36:44 +01:00
Travis Ralston
a5f3318f3b Convert view_user dispatch to prove the conversion works 
This is a relatively obvious dispatch action that doesn't require a lot of complicated type definitions, so should be a good candidate to prove the thing works. If for some reason the thing stops working, we've done something wrong.

This also adds a bit of generic types to the dispatch call so we don't confuse the tsx parser by using `dis.dispatch(<ViewUserPayload>{...})` as it thinks that's supposed to be a component. We still get type safety, and the thing remains happy with the generics approach.
 2020-05-13 21:07:50 -06:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory 
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
 2020-05-13 21:07:50 -06:00
David Baker
8b8eb7d3c0
Merge pull request #4580 from matrix-org/dbkr/dont_npe_if_no_device 
Avoid soft crash if unknown device in verification
 2020-05-12 14:36:54 +01:00
David Baker
ae2645b69b Provide separate translatable for case where we have no device 2020-05-12 12:42:16 +01:00
David Baker
3c5c7f56f3 Adjust comment 2020-05-12 11:14:05 +01:00
David Baker
5c0920da42 Avoid soft crash if unknown device in verification 
Rageshakes from the wild indicate that device was null here which
implies that we somehow did not know about the device when verifiying
it? Log and null-check to avoid a soft crash.
 2020-05-12 11:05:30 +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
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
David Baker
4dca66d140 No need for this if statement now 2020-04-28 09:43:24 +01:00
David Baker
ff1fd15e72 Use the New Session review dialog for verifying our own devices 2020-04-27 20:31:14 +01:00
Bruno Windels
b8dd68dda2 wait until cross-signing keys are fetched to show verify button 2020-04-21 18:36:15 +02:00
Travis Ralston
e72008d7f1 Fix end-to-end tests for end-to-end encryption verification 
Fixes https://github.com/vector-im/riot-web/issues/13226

This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.
 2020-04-17 14:31:33 -06:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting 
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
 2020-04-15 13:18:42 -06:00
Michael Telatynski
712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 19:03:12 +01:00
Michael Telatynski
fe401ce4da
Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Bruno Windels
cdbd4da0e4 adjust copy for self-verification in verification panel 2020-04-03 17:04:29 +02:00
Bruno Windels
030d594e67 for self-verif, mention which device, not user we're verifying in panel 2020-04-03 17:03:37 +02:00
Bruno Windels
2ee780caa2 pass isSelf flag to sas component 2020-04-02 18:28:14 +02:00
Bruno Windels
cc9c5cabb3 adapt encryption info to self-verification 
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
 2020-04-02 17:51:25 +02:00
Bruno Windels
081baa2359 set dialog title for self-verification 
use request.isSelfVerification helper
 2020-04-02 17:51:06 +02:00
Bruno Windels
1baaafe7b9 some comments to explain the mess 2020-04-02 16:44:42 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
Bruno Windels
1f65cfb7f6 polish design and disable buttons after click 2020-04-02 13:44:19 +02:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
119fd2f519 fixup: these are actually on the verifier 2020-04-02 13:44:19 +02:00
Bruno Windels
00b1afe0fa first go at reciprocate UX 2020-04-02 13:44:19 +02:00
Bruno Windels
1353ddaa96 move qr code data generation to js-sdk 2020-04-02 13:41:19 +02:00
Travis Ralston
59a99bbad8
Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount 
Use componentDidMount in place of componentWillMount where possible
 2020-04-01 11:13:04 -06:00
Michael Telatynski
0d8fd83e4d move aria-label and title so that it doesn't wrap the e2e icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-01 17:16:28 +01:00
Michael Telatynski
4a4a13ac75 Fix UserInfo e2e buttons to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-01 12:21:18 +01:00
Travis Ralston
3f99332f4b Use componentDidMount in place of componentWillMount where possible 
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
 2020-03-31 14:14:17 -06:00
Michael Telatynski
eb901441cd Fix alignment of e2e icon in userinfo and expose full displayname in title 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 16:14:18 +01:00
J. Ryan Stinnett
37619dd127 Show red shield for users that become unverified 
For any users that we previously verified but that are not unverified, we will
now mark them and rooms they are in with a red shield.

Fixes https://github.com/vector-im/riot-web/issues/12808
 2020-03-28 00:21:18 +00:00
Michael Telatynski
cf4f595f79
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar 
blank out UserInfo avatar when changing between members
 2020-03-27 10:21:53 +00:00
Michael Telatynski
a974f0fe46 blank out UserInfo avatar when changing between members 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-27 09:59:18 +00:00
Bruno Windels
a6fbb98252 only show close button when not in a dialog, which already has one 2020-03-26 17:02:32 +01:00
Bruno Windels
34b0c1b1e7 fix lint & other cleanup 2020-03-26 16:54:31 +01:00
Bruno Windels
9b54d15fcd add cancel button to verification panel 2020-03-26 16:53:46 +01:00
Michael Telatynski
7ca6a4b777 Iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 23:00:46 +00:00
Michael Telatynski
be3167c870 always show Devices section 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 22:44:09 +00:00
Michael Telatynski
d098c91c30 Update cross-signing verification copy and fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 22:38:11 +00:00
Bruno Windels
301b484371 ask request if method is supported rather than checking ourselves 2020-03-20 13:37:00 +01:00
Bruno Windels
ddbfe4e1fa enable 4S if needed when trying to verify 2020-03-10 16:31:40 +01:00
Bruno Windels
1f9bd55f3b revert to legacy user verification (over to_device) without xsign keys 2020-03-06 17:37:01 +01:00
Bruno Windels
7d051d6a1d await request promise inside encryption panel to show spinner 2020-03-05 17:44:35 +01:00
Bruno Windels
a5cd0a7d5f indent by 4 spaces 2020-03-05 11:09:45 +01:00