Commit Graph

12860 Commits

Author SHA1 Message Date
Šimon Brandner b36a727a09 Fourth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:15:05 +02:00
Šimon Brandner 799d10b77e Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 2021-07-02 17:34:56 +02:00
Michael Telatynski 171874ae30 Use FocusLock around ContextMenus to simplify focus management 2021-07-02 16:31:37 +01:00
Šimon Brandner 426c79f47d Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:25:30 +02:00
Šimon Brandner 7325abebd9 Third batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:19:01 +02:00
Šimon Brandner 9d569c378e Second batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 17:08:27 +02:00
Michael Telatynski 89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Michael Telatynski 912e192dc6 Tweak behaviour of setting restricted join rule 2021-07-02 15:18:27 +01:00
Michael Telatynski e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Šimon Brandner 090acc4811 Unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:41:36 +02:00
Šimon Brandner 259b36c13d Remove unused code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:38:44 +02:00
Šimon Brandner 0d8f84c769 Delete lozenge effect
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 15:35:52 +02:00
Šimon Brandner 9a1b73f867 Convert ReplyTile to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:51:51 +02:00
Šimon Brandner 6645036780 Convert MImageReplyBody to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:17:40 +02:00
Šimon Brandner 5d78eb4a75 Member delimiter rules
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 14:01:30 +02:00
Šimon Brandner 5f49b2d374 Missing args
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:55:39 +02:00
Šimon Brandner 869f31deef Convert MImageBody to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:46:42 +02:00
Šimon Brandner 38710eab88 Export IProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:31:56 +02:00
Jaiwanth 8c6f801486 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-02 16:58:04 +05:30
Šimon Brandner 297116a3b7 MORE DELINT!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:23:18 +02:00
Jaiwanth 87c624d085 Use ref for progress updates 2021-07-02 16:52:33 +05:30
Šimon Brandner 9383ecc46f Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:20:02 +02:00
Šimon Brandner b014763cd2 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Michael Telatynski 82119a08f7 Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Tulir Asokan 598689b059 Run eslint 2021-07-02 12:56:08 +03:00
Tulir Asokan 5240209529 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-07-02 12:39:51 +03:00
Michael Telatynski 0425b02982 Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
Michael Telatynski fb149c4ea2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-02 09:06:19 +01:00
Jaiwanth f2e67604e7 Delint 2021-07-02 10:49:24 +05:30
Jaiwanth 190ccb6f00 Merge and add export support for the modified MAudioBody 2021-07-02 10:41:04 +05:30
Jaiwanth 6ca664636e Display progress 2021-07-02 10:23:34 +05:30
Michael Telatynski 5d1a1b46f3 Fix instances of the Edit Message Composer's save button being wrongly disabled 2021-07-01 23:48:52 +01:00
David Baker 80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
Michael Telatynski 88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
David Baker 53b89bbcd9 Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader
Convert RoomHeader to TS
2021-07-01 21:33:11 +01:00
Michael Telatynski c2545923c1 Use better types to make CI happy 2021-07-01 21:10:37 +01:00
David Baker eb1a22ab19 Add types 2021-07-01 21:00:54 +01:00
David Baker 38ed53d5d1 Oops, don't just blindly insert the commented type
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 20:58:51 +01:00
David Baker 3db95d607d Use semicolons
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 20:57:56 +01:00
Michael Telatynski 12cce2a938 delint 2021-07-01 20:51:13 +01:00
Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
David Baker e121e5bf8a nice try, vscode 2021-07-01 19:58:25 +01:00
David Baker 8bbb768825 Convert RoomHeader to TS
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
2021-07-01 19:54:05 +01:00
David Baker ae16efcf5b Remove rateLimitedFunc 2021-07-01 18:35:38 +01:00
Šimon Brandner 725f69a400 Add button to show all keybaord shortcuts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-01 19:03:49 +02:00
Šimon Brandner e355bf0db1 Merge remote-tracking branch 'upstream/develop' into reorganize-preferences 2021-07-01 18:53:53 +02:00
David Baker fdef1f9b68 Merge pull request #6299 from matrix-org/dbkr/tsify_setupencryptionbody
Convert some Key Verification classes to TypeScript
2021-07-01 15:33:15 +01:00
Germain Souquet d804df84a7 Allow missing sender in event 2021-07-01 15:16:47 +01:00
David Baker c6d1dc7e8e lint 2021-07-01 15:11:18 +01:00
David Baker 7e8bb70621 Never mind, it wasn't even used 2021-07-01 14:55:00 +01:00