Travis Ralston
|
870c35be6f
|
Merge branch 'develop' into travis/ft-sep1620/09-enc-files
|
2020-09-18 10:56:20 -06:00 |
|
Michael Telatynski
|
d267092b19
|
Make the upload_file dispatch synchronous to make Firefox happy about it
|
2020-09-18 12:33:25 +01:00 |
|
Michael Telatynski
|
780aea1a36
|
Mac sends lowercase event.key even when holding Shift unlike Windows
|
2020-09-18 12:32:33 +01:00 |
|
Travis Ralston
|
bfbbf44dfc
|
Add a note to use the desktop builds when seshat isn't available
Fixes https://github.com/vector-im/element-web/issues/15184
This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
|
2020-09-16 17:23:37 -06:00 |
|
J. Ryan Stinnett
|
26b465f1fd
|
Remove room recovery reminder
The Secure Backup toast replaces this with better UX.
Part of https://github.com/vector-im/element-web/issues/13895
|
2020-09-16 15:03:06 +01:00 |
|
Travis Ralston
|
dc44b9ef59
|
Store and thread 3pid invite through the app
This doesn't do anything with the stored value (yet), but enables us to do something with it in a future commit.
|
2020-09-11 19:49:48 -06:00 |
|
Michael Telatynski
|
a1f1334250
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3
Conflicts:
src/components/structures/RoomView.tsx
|
2020-09-09 15:16:19 +01:00 |
|
Michael Telatynski
|
9d85d0436c
|
iterate PR
|
2020-09-08 15:22:23 +01:00 |
|
Michael Telatynski
|
3bc42d7470
|
delint
|
2020-09-08 11:05:33 +01:00 |
|
Michael Telatynski
|
906d4defd5
|
Convert RoomView and RoomContext to TS
|
2020-09-08 10:52:37 +01:00 |
|