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
|
48c535e578
|
hide setup encryption toasts on an e2ee-default:false config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-02 21:40:32 +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
|
14cee41360
|
Convert things to Typescript and re-use a generic component
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-22 13:29:53 +01:00 |
|
Michael Telatynski
|
b21e5ba10b
|
Set new granular priorities
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-22 12:57:48 +01:00 |
|
Michael Telatynski
|
3bf5e003a1
|
Convert DeviceListener to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-22 12:54:03 +01:00 |
|