Šimon Brandner
dcb5557848
Revert some changes due to failing tests
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:00:07 +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
Š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
3287d3dd53
Merge pull request #6305 from matrix-org/t3chguy/ts/11
2021-07-02 15:08:53 +01:00
Michael Telatynski
b17d72c399
fix duplicate import
2021-07-02 14:54:10 +01:00
Šimon Brandner
158f9056a6
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
2021-07-02 12:18:02 +02:00
Šimon Brandner
a4fe2f143f
First batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 12:12:41 +02:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11
2021-07-02 11:03:54 +01:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10
2021-07-02 09:51:58 +01:00
David Baker
780c413b5d
Merge pull request #6306 from matrix-org/dbkr/ts_semicolons
...
Comply with new member-delimiter-style rule
2021-07-01 23:53:57 +01:00
David Baker
1fe0c2ab88
Bump eslint plugin version
2021-07-01 23:45:08 +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
David Baker
bd470f8897
Merge pull request #6304 from matrix-org/dbkr/tests_lint
...
Fix Test Linting
2021-07-01 23:20:45 +01:00
David Baker
6aa0a4428e
Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint
2021-07-01 23:11:43 +01:00
David Baker
f96553615e
Merge pull request #6303 from matrix-org/dbkr/tsify_markdown
...
Convert Markdown to TypeScript
2021-07-01 23:09:27 +01:00
David Baker
fda17b4959
Add types to the implementations too
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-01 23:02:51 +01:00
Michael Telatynski
88f691776f
Use sleep from js-sdk as no point duplicating it
2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d
Use defer from js-sdk as it has a better ts definition
2021-07-01 22:50:06 +01:00
David Baker
08176beb58
Kill mock-clock
...
We already import sinon's one in UserActivitytest, so use that here too.
2021-07-01 21:52:15 +01:00
David Baker
536e3aadd7
Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint
2021-07-01 21:39:17 +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
David Baker
c1310bcd9f
Better types
2021-07-01 21:31:17 +01:00
Michael Telatynski
c2545923c1
Use better types to make CI happy
2021-07-01 21:10:37 +01:00
Michael Telatynski
c80ba16ae9
Merge pull request #6296 from matrix-org/t3chguy/fix/17853
...
Prevent RoomDirectory from exploding when filterString is wrongly nulled
2021-07-01 21:07:35 +01:00
Michael Telatynski
a9e28db330
Merge pull request #5099 from matrix-org/travis/blurhash
2021-07-01 21:06:37 +01:00
Michael Telatynski
ac0f1ebf93
fix field accesses in tests and default params
2021-07-01 21:05:57 +01:00
Michael Telatynski
c51e62a62b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/10
2021-07-01 21:01:06 +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
David Baker
543fe6382d
Fix linting in tests
...
Or in the case of one test, disbale just the one rule it breaks
2021-07-01 20:54:04 +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
ee9be5438e
eslint --fix
2021-07-01 20:43:05 +01:00
David Baker
e6b754f8dd
Convert Markdown to TypeScript
2021-07-01 20:33:25 +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
e3201eb20f
Merge pull request #6300 from matrix-org/dbkr/kill_ratelimitedfunc
...
Remove rateLimitedFunc
2021-07-01 19:01:15 +01:00
David Baker
9ea4ca39c6
Be more like other arrow functions
2021-07-01 18:54:51 +01:00
David Baker
ae16efcf5b
Remove rateLimitedFunc
2021-07-01 18:35:38 +01: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
David Baker
5e3c8fae5c
put this just on the buttons
2021-07-01 15:22:44 +01:00
David Baker
404aa96f48
i18n
2021-07-01 15:13:24 +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
David Baker
66d95ed7b2
Fix button styling in verification bubbles
2021-07-01 14:51:20 +01:00
David Baker
676163d5cd
convert NewSessionReviewDialog
2021-07-01 14:51:07 +01:00
David Baker
5d3b94b7c9
Convert VerificationRequestDialog
2021-07-01 14:22:58 +01:00
