Travis Ralston
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
David Baker
2125bcf5a6
Comment remaining non-cross-signing-compliant components
...
Fixes https://github.com/vector-im/riot-web/issues/11748
2020-01-03 15:38:59 +00:00
Travis Ralston
d56f0f2a25
Convert many imports to handle ES6 exports
...
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
Bruno Windels
3b10b8042a
restyle unknown devices dialog
2019-02-12 18:34:35 +01:00
Bruno Windels
ce5e56aaac
update icons in member info device section
2019-02-01 17:32:46 +01:00
J. Ryan Stinnett
20e296b20e
Convert image URLs in React to require
calls
...
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
2019-01-17 22:06:49 -06:00
Aidan Gauland
35780f5ae0
Remove use of deprecated React.PropTypes
...
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
2017-12-26 14:03:18 +13:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Kegan Dougal
00df956ca2
Add remaining translations!
...
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
2017-06-08 14:08:51 +01:00
Kegan Dougal
d2e766e4f0
First round
2017-06-02 10:18:31 +01:00
David Baker
18d4d3392a
Fix a bunch of linting errors
...
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
Richard van der Hoff
c7fb83ed2d
s/block/blacklist for e2e
...
Fixes https://github.com/vector-im/vector-web/issues/2315
2016-11-29 18:48:43 +00:00
Richard van der Hoff
dd2da20031
Add the deviceId back to memberdeviceinfo
...
It was removed by @ara4n in 5fa5489
, but it's still useful!
2016-09-22 19:28:50 +01:00
Richard van der Hoff
2f7b4f74fd
Move the device verification buttons to their own class
...
Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog
for utterly no reason and breaking everything
2016-09-22 19:24:09 +01:00
Matthew Hodgson
5fa5489bbd
disambiguate devices by ID in memberinfo
2016-09-17 20:12:56 +01:00
Matthew Hodgson
f95a74951e
label device IDs
2016-09-15 02:49:25 +01:00
Matthew Hodgson
ce655c7f50
improve device info
2016-09-15 02:44:55 +01:00
Matthew Hodgson
8bda0bb095
basic verification UI
2016-09-15 01:55:51 +01:00
Matthew Hodgson
9b7ab46a72
dedicated dialog box for E2E messages
2016-09-12 23:42:24 +01:00
Richard van der Hoff
b724b0c6b6
Update MemberDeviceInfo display
...
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
2016-09-09 11:41:56 +01:00
Richard van der Hoff
31e09e6137
Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
...
Make MemberInfo to use client.getStoredDevicesForUser
2016-09-05 10:38:24 +01:00
Richard van der Hoff
fc40bdcbfc
Make MemberInfo to use client.getStoredDevicesForUser
...
It's more powerful than listDeviceKeys, and isn't deprecated.
2016-09-05 00:08:16 +01:00
Richard van der Hoff
a316c652b7
Convert MemberDeviceInfo to ES6 class
2016-09-04 21:49:06 +01:00
Richard van der Hoff
55f4d23625
MemberDeviceInfo: Use the device name, where available
...
we now have device name for e2e devices: use it!
2016-08-03 14:18:09 +01:00
Richard van der Hoff
a1dd427420
Implement device blocking
...
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146 . It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.
Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
2016-06-23 17:30:04 +01:00
Richard van der Hoff
ad00abe9c0
Support for making devices unverified
...
Because its useful for testing
Requires support from js-sdk, and (ideally) css from vector-web
2016-06-17 16:24:23 +01:00
Richard van der Hoff
85770feb31
device verification: use a js-sdk event
...
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
Richard van der Hoff
7ce49c752f
Wire up events to update UI on device verification
...
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
Richard van der Hoff
f3e66e6fd2
Add device info to member info
...
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00