mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 08:41:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
35079 commits 219 branches 562 tags 474 MiB
Commit graph

27834 commits

Author SHA1 Message Date
Šimon Brandner
7734f8aeef
Handle focusing multiple composers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:33:49 +02:00
Šimon Brandner
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:17:34 +02:00
Michael Telatynski
4978c27dd5
Merge pull request #6326 from matrix-org/revert-6135-t3chguy/fix/17494 2021-07-08 14:56:55 +01:00
Michael Telatynski
f8907a6ea4 Fix bug which prevented more than one event getting pinned 2021-07-08 14:48:06 +01:00
Michael Telatynski
8e7e4c9e8d Convert MessageContextMenu to Typescript 2021-07-08 14:47:36 +01:00
Michael Telatynski
94a7812039 Extract MXCs from _matrix/media/r0/ URLs for inline images in messages 2021-07-08 14:22:38 +01:00
Michael Telatynski
00a3f5d469 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into revert-6135-t3chguy/fix/17494 2021-07-08 13:29:10 +01:00
Michael Telatynski
5d72ea5e19 Fix Space Create menu not disabling the alias field when busy 2021-07-08 13:24:56 +01:00
Michael Telatynski
fc05395dba Don't close settings dialog when opening spaces feedback prompt 2021-07-08 13:24:16 +01:00
Šimon Brandner
14687f3630
Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023 2021-07-08 13:19:46 +02:00
Šimon Brandner
64f32a9fc1
Focus composer after reacting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 13:12:57 +02:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage 
Update import location for types
 2021-07-08 09:18:31 +01:00
David Baker
086a8cbbb3 Update import location for types 
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
 2021-07-07 20:19:52 +01:00
Michael Telatynski
4ce3723e84 Switch to blurhash-react instead of homegrown component 
this has the advantage of resolution scaling logic to do more gpu accelerated scaling
 2021-07-07 20:00:31 +01:00
Michael Telatynski
06d589d769 Lower number of blurhash components and apply image ratio to it 2021-07-07 19:43:12 +01:00
Michael Telatynski
882e66e215 remove stale comment, we include vias now 2021-07-07 18:17:33 +01:00
Michael Telatynski
b9a539eaa2 Improve URL Previews 
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
 2021-07-07 18:04:30 +01:00
Germain
209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire 2021-07-07 16:30:54 +01:00
Šimon Brandner
14303a4ca8
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:20:31 +02:00
Šimon Brandner
f91b35a0a0
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:12:19 +02:00
Michael Telatynski
25dab1eb64
Merge pull request #6307 from matrix-org/t3chguy/fix/17858 
Fix instances of the Edit Message Composer's save button being wrongly disabled
 2021-07-07 16:03:27 +01:00
Michael Telatynski
30fa5419db
Revert "ignore hash/fragment when de-duplicating links for url previews" 2021-07-07 14:30:08 +01:00
Šimon Brandner
5b5ef5e04c
Handle servers from settings 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:59:02 +02:00
Šimon Brandner
255ab49ccb
Handle edge cases 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:48:48 +02:00
Šimon Brandner
b94dc2d0e5
Remember the last used server for room directory searches 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:51 +02:00
Šimon Brandner
1220ad37ce
Remove the usage of symbol 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:44 +02:00
David Baker
984dc40f9c Clarify the keys we use when submitting rageshakes 
'pk' is a bit opaque in a context with both private keys and public keys
 2021-07-07 10:54:21 +01:00
Priit Jõerüüt
f0b6fcf503 Translated using Weblate (Estonian) 
Currently translated at 98.6% (3006 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-07 08:35:44 +00:00
Govindas
747518c551 Translated using Weblate (Lithuanian) 
Currently translated at 73.4% (2176 of 2961 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2021-07-07 08:35:40 +00:00
random
ee03fffa2f Translated using Weblate (Italian) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-07-07 08:35:37 +00:00
Artur Nowak
151cf661e0 Translated using Weblate (Polish) 
Currently translated at 71.1% (2166 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-07-07 08:35:30 +00:00
LinAGKar
7573434cec Translated using Weblate (Swedish) 
Currently translated at 98.0% (2988 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-07-07 08:35:29 +00:00
Szimszon
5c9d9b4899 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-07-07 08:35:26 +00:00
Thibault Martin
f8772be23c Translated using Weblate (French) 
Currently translated at 99.9% (3044 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-07-07 08:35:17 +00:00
iaiz
2704687fe4 Translated using Weblate (Spanish) 
Currently translated at 99.9% (3043 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-07-07 08:35:05 +00:00
Thore
3031e1f8e2 Translated using Weblate (German) 
Currently translated at 99.4% (3030 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-07 08:34:53 +00:00
Šimon Brandner
38a061a2df
Fix ImageView context menu 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-06 20:59:12 +02:00
Germain Souquet
a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Michael Telatynski
d004163177 Fix 2 new NPEs 2021-07-06 12:05:30 +01:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Michael Telatynski
eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski
692347843d Track restricted join rule support in the SpaceStore for sync access 2021-07-06 10:09:35 +01:00
Michael Telatynski
44bbf60973 Convert Dropdown to Typescript 2021-07-06 09:56:02 +01:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Germain
47b297c2db
Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00
Germain Souquet
925d434d53 Linting fix in TypeScript interface 2021-07-05 09:19:19 +02:00
Germain Souquet
8d34767768 Fix i18n after deprecation 2021-07-05 09:18:16 +02:00
Priit Jõerüüt
3fe72e4960 Translated using Weblate (Estonian) 
Currently translated at 98.1% (2991 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-03 19:35:01 +00:00
Besnik Bleta
929b92ce28 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3037 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-03 19:34:58 +00:00
LinAGKar
7ca7c0a5c0 Translated using Weblate (Swedish) 
Currently translated at 97.9% (2985 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-07-03 19:34:55 +00:00
libexus
d559ba1835 Translated using Weblate (German) 
Currently translated at 99.4% (3030 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-03 19:34:51 +00:00
Robin Townsend
055f3a72ad Fix being able to un-rotate images 
Since 0 is falsy, this made it impossible to return images to 0 degrees
of rotation.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-03 15:18:47 -04:00
Germain Souquet
b5ff7eb7d2 Migrate VerificationShowSas to TypeScript 2021-07-03 12:43:18 +01:00
Germain Souquet
103caffb5b Delete unused VerificationQREmojiOPtions 2021-07-03 12:35:14 +01:00
Germain Souquet
a1135783bc Migrate VerificationComplete to TypeScript 2021-07-03 12:32:08 +01:00
Germain Souquet
b18691a1cb Migrate VerificationCancelled to TypeScript 2021-07-03 12:31:10 +01:00
Germain Souquet
66dde68377 Migrate VectorPushRulesDefinitions to TypeScript 2021-07-03 12:29:13 +01:00
Germain Souquet
d5cebf5e8d Migrate index to TypeScript 2021-07-03 12:22:58 +01:00
Germain Souquet
e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Germain Souquet
ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01:00
Germain Souquet
ef2848664f Migrate InlineTermsAgreement to TypeScript 2021-07-03 12:03:00 +01:00
Germain Souquet
f4ec197513 Migrate ForgotPassword to TypeScript 2021-07-03 11:55:10 +01:00
Germain Souquet
298a338676 Migrate CompleteSecurity to TypeScript 2021-07-03 11:38:51 +01:00
Germain Souquet
dbd102541e Migrate E2eSetup to TypeScript 2021-07-03 11:37:06 +01:00
Šimon Brandner
68011056cc
Eleventh and final batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 12:24:07 +02:00
Šimon Brandner
5d054519dc
Tenth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:57:05 +02:00
Šimon Brandner
d99874318c
Ninth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:51:23 +02:00
Šimon Brandner
916589e2b9
Eighth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:24:33 +02:00
Šimon Brandner
6e14c290c8
Seventh batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 10:59:57 +02:00
Šimon Brandner
914de71e9c
Sixth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 10:44:03 +02:00
Šimon Brandner
ab4cd9d0fd
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 10:10:17 +02:00
Šimon Brandner
b7ef7d2a47
Fifth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 10:06:42 +02:00
Šimon Brandner
6702e68778
Revert some changes due to them breaking tests (and hope it will work now) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 09:36:18 +02:00
Šimon Brandner
be4c29b27c
Revert some changes due to them breaking Element 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 08:50:45 +02:00
Š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
b40027a193
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 18:02:41 +02:00
Š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
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
2308ed6c8e
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 14:57:08 +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
969be09210
Add a few things to IMediaEventContent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:55:36 +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
Priit Jõerüüt
7d8e991f60 Translated using Weblate (Estonian) 
Currently translated at 97.8% (2980 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-02 11:36:51 +00:00
Besnik Bleta
5b04b3d68c Translated using Weblate (Albanian) 
Currently translated at 99.7% (3037 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-07-02 11:36:45 +00:00
Govindas
1594713f12 Translated using Weblate (Lithuanian) 
Currently translated at 72.9% (2159 of 2961 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2021-07-02 11:36:29 +00:00
waclaw66
1fa0298fba Translated using Weblate (Czech) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-07-02 11:35:50 +00:00
random
53a4c7372c Translated using Weblate (Italian) 
Currently translated at 98.8% (3010 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-07-02 11:35:33 +00:00
Jeff Huang
1e86fef8c1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-02 11:35:23 +00:00
jelv
adea331746 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3046 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-02 11:35:06 +00:00
Szimszon
ebd4b35757 Translated using Weblate (Hungarian) 
Currently translated at 98.0% (2987 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-07-02 11:34:51 +00:00
libexus
7e3163c9d9 Translated using Weblate (German) 
Currently translated at 99.4% (3030 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-02 11:34:45 +00:00
Šimon Brandner
38710eab88
Export IProps 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:31:56 +02: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
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
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
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
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
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
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
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
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
Šimon Brandner
4f70d9021a
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-01 19:05:11 +02: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
Šimon Brandner
3cc041a4ae
Change displayName of ctrlEnterToSend 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-01 18:53:38 +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
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
Michael Telatynski
04902fa2e4
Merge pull request #6292 from matrix-org/t3chguy/ts/9 2021-07-01 14:11:17 +01:00
David Baker
16fb24fa09 Remove unused prop 2021-07-01 14:03:01 +01:00
David Baker
642405dbd0 Use new types 2021-07-01 13:55:57 +01:00
David Baker
70a3679d43 more ts 2021-07-01 13:49:58 +01:00
David Baker
46b2f0404a Basic ts-ification of SetupEncryptionBody 2021-07-01 13:45:33 +01:00
Michael Telatynski
4c42313f99 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-01 12:47:34 +01:00
Germain Souquet
9c93b9002f Add extra context for filtering out '>' for sanitizeHtml 2021-07-01 12:23:36 +01:00
Germain Souquet
04db8333e3 Fix typing and unused import 2021-07-01 12:13:43 +01:00
Germain Souquet
ede87129b2 Add a layout fallback for EventTile 2021-07-01 11:45:29 +01:00
Germain Souquet
6f62233634 Prevent browser to crash when unclosed HTML tag is sent to sanitizeHtml 2021-07-01 11:18:07 +01:00
Germain Souquet
d47194e61d Migrate SearchResultTile to TypeScript 2021-07-01 11:17:44 +01:00
Michael Telatynski
5c6466d824 use better types 2021-07-01 10:01:48 +01:00
Michael Telatynski
d354a0a23b Prevent RoomDirectory from exploding when filterString is wrongly nullified 2021-07-01 09:57:33 +01:00
Michael Telatynski
fcdb0a27d0 Convert EventTimeline, EventTimelineSet and TimelineWindow to TS 2021-07-01 09:53:54 +01:00
Michael Telatynski
30d027d2b4 fix js-sdk lib import 2021-07-01 08:29:53 +01:00
Michael Telatynski
6693993d08 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/9 2021-07-01 08:21:59 +01:00
Travis Ralston
3d5117c631
Merge pull request #6264 from matrix-org/travis/new-audio 
Add custom audio player
 2021-06-30 15:17:48 -06:00
Travis Ralston
da8a783ca0 lint 2021-06-30 14:51:18 -06:00
Travis Ralston
a5a4f2ed7d Fix linter + merge 2021-06-30 13:29:37 -06:00
Travis Ralston
12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
J. Ryan Stinnett
a9f35e8c69 Lint MXC APIs to centralise access 
This adds linting rules to ensure that MXC APIs are only accessed via the
`Media` helper so they can be customised easily when desired.

Fixes https://github.com/vector-im/element-web/issues/16933
 2021-06-30 14:19:39 +01:00
Michael Telatynski
3a80df4222 Fix react context not being assigned during construction 2021-06-30 13:45:43 +01:00
Michael Telatynski
0a5abb09f4 Fixes identified by TS 2021-06-30 13:03:29 +01:00
Michael Telatynski
e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
Germain Souquet
f3b4a21815 Remove Tinter reference 2021-06-30 09:02:00 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Robin Townsend
c0e10218d9 Fix lints 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-29 22:42:46 -04:00
Robin Townsend
adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -04:00
Michael Telatynski
29904a7ffc
Merge pull request #6263 from matrix-org/t3chguy/ts/4 2021-06-29 22:31:16 +01:00
Michael Telatynski
6250d9ba61
Merge branch 'develop' into t3chguy/ts/4 2021-06-29 22:24:47 +01:00
Michael Telatynski
a59e94b907 delint 2021-06-29 22:21:05 +01:00
Michael Telatynski
8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
 2021-06-29 22:14:40 +01:00
J. Ryan Stinnett
9d6d8fc666
Merge pull request #6285 from matrix-org/jryans/rework-linting-2 
Migrate to `eslint-plugin-matrix-org`
 2021-06-29 17:45:10 +01:00
Germain Souquet
d035151116 Avoid cyclic dependencies by moving watchers out of constructor 2021-06-29 17:04:51 +01:00
J. Ryan Stinnett
782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:27:24 +01:00
J. Ryan Stinnett
21b8c81eb8 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:25:30 +01:00
Michael Telatynski
623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/TimelinePanel.tsx
 2021-06-29 15:22:54 +01:00
Germain
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter 
Deprecate Tinter and TintableSVG
 2021-06-29 15:22:48 +01:00
Germain
78f1748634
Merge pull request #6283 from matrix-org/gsouquet/filepanel-typescript 2021-06-29 15:15:29 +01:00
Govindas
d68fa223bc Translated using Weblate (Lithuanian) 
Currently translated at 65.5% (1941 of 2961 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2021-06-29 13:08:42 +00:00
Weblate
0b4cb9af54 Merge branch 'origin/develop' into Weblate. 2021-06-29 13:02:29 +00:00
Priit Jõerüüt
8d79a10135 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2988 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-06-29 13:02:26 +00:00
Govindas
7df42b1bdb Translated using Weblate (Lithuanian) 
Currently translated at 65.1% (1951 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2021-06-29 13:02:24 +00:00
libexus
f35fe7c57f Translated using Weblate (German) 
Currently translated at 99.8% (2988 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-06-29 13:02:12 +00:00
J. Ryan Stinnett
0551becafd Fix long lines 2021-06-29 13:42:51 +01:00
J. Ryan Stinnett
fe123fc605 Rework lint comments 2021-06-29 13:35:43 +01:00
J. Ryan Stinnett
bbdd93f592 Auto-fix more errors 2021-06-29 13:26:09 +01:00
J. Ryan Stinnett
b501665971 Fix parsing errors 2021-06-29 13:23:13 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
J. Ryan Stinnett
4c5720a573 Update lint comments 2021-06-29 12:51:13 +01:00
J. Ryan Stinnett
2d3163fef5 Remove Flow support 
We no longer use Flow, so this removes linting and compiling support. New code
should use TypeScript for static typing.
 2021-06-29 12:31:44 +01:00
Michael Telatynski
88cd5aeaf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/StyledRadioGroup.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-06-29 12:29:45 +01:00
Germain Souquet
db015519ed Code style changes for FilePanel 2021-06-29 12:19:27 +01:00
Germain
56e05041fd
Import curly spaces 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-29 12:13:41 +01:00
Germain Souquet
652f57371a Migrate FilePanel to TypeScript 2021-06-29 11:38:19 +01:00
Michael Telatynski
b70297c510
Merge pull request #6277 from matrix-org/t3chguy/fix/17793 
Fix back button on user info card after clicking a permalink
 2021-06-29 10:55:53 +01:00
J. Ryan Stinnett
14ef38e057
Merge pull request #6280 from robintown/group-acls 
Group ACLs with MELS
 2021-06-29 10:02:12 +01:00
Michael Telatynski
0cc7f42f08
Merge pull request #6282 from matrix-org/t3chguy/fix/17738 
Fix editState not getting passed through
 2021-06-29 09:14:17 +01:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Michael Telatynski
298bf30b18 Fix editState not getting passed through 2021-06-29 08:16:43 +01:00
Aaron Raimist
734dbae248 Merge branch 'develop' into string-pl 2021-06-28 22:49:13 -05:00
Aaron Raimist
434b313850 Merge branch 'develop' into string-pl 2021-06-28 22:13:51 -05:00
Travis Ralston
7a4ceec985 Restore clamped dimensions on voice recorder waveform 2021-06-28 21:02:42 -06:00
Travis Ralston
d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston
964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston
b6d9ecde8b
Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf 
Improve audio recording performance
 2021-06-28 20:49:21 -06:00
Travis Ralston
e519e704e9
Apply suggestions from code review 2021-06-28 20:40:11 -06:00
Michael Telatynski
86228e08d8
Merge pull request #6278 from matrix-org/t3chguy/fix/17738 2021-06-28 23:24:31 +01:00
Tulir Asokan
bf55672263 Remove unused import 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-06-28 21:08:19 +03:00
Tulir Asokan
188bd548c6 Let m.notice messages mark a room as unread 
The typescript conversion of Unread.js in matrix-org/matrix-react-sdk#6241
fixed a 6-year-old typo and stopped messages with msgtype=m.notice from being
counted as unread messages. This makes it very difficult to use rooms dedicated
for bot notices (like RSS or GitHub webhook bots).

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-06-28 20:51:14 +03:00
Robin Townsend
a11193e243 Group ACLs with MELS 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-28 12:36:40 -04:00
Michael Weimann
d3bc7fe806
remove list keys 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-28 18:29:32 +02:00
Michael Weimann
e685f1239d
use null vars for context menu lists 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-28 18:29:32 +02:00
Germain Souquet
6607294573 Deprecate Tinter and TintableSVG 2021-06-28 17:13:23 +01:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht 
Removes the override on the Bubble Container
 2021-06-28 16:23:40 +01:00
Michael Telatynski
e43df0e3c6 delint 2021-06-28 16:11:38 +01:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Michael Telatynski
c708afe216 Pull scroll_to_bottom up a level similarly to prevent it firing on NotifPanel/FilePanel when sending a message 2021-06-28 16:03:52 +01:00
Michael Telatynski
fd9e891647 Clean up by pulling listeners up to parent RoomView 2021-06-28 16:02:34 +01:00
Michael Telatynski
83af38a85f Fix multiple timeline panels handling composer and edit events 2021-06-28 15:56:37 +01:00
Michael Telatynski
208c62048f Fix right panel store cleaning some state when permalink within room is clicked 2021-06-28 15:48:13 +01:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Germain Souquet
652e06a7b1 remove cancelAnimationFrame complexity and rely on MarkedExecution class 2021-06-28 09:24:35 +01:00
Germain
a576362c74
Merge pull request #6275 from matrix-org/gsouquet/toast-button-kind 2021-06-28 09:10:09 +01:00
Germain Souquet
d669f55b60 Make toast dismiss button less prominent 2021-06-28 08:52:15 +01:00
Travis Ralston
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice 
Encrypt the voice message file if needed
 2021-06-28 01:30:16 -06:00
Travis Ralston
c16228b8ca
Update src/voice/VoiceRecording.ts 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-28 01:22:05 -06:00
J. Ryan Stinnett
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786 
Fix hyper-precise presence
 2021-06-26 18:47:17 +01:00
Šimon Brandner
3c6612df93
Fix hyper-precise presence 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 07:53:42 +02:00
Travis Ralston
b5bb767b8f Appease the linter 2021-06-25 14:11:50 -06:00
Travis Ralston
cb0d2a2c4f Encrypt the voice message file if needed 
Fixes https://github.com/vector-im/element-web/issues/17729

"oops, should have done that"
 2021-06-25 13:54:05 -06:00
Michael Telatynski
4e6260e617 delint 2021-06-25 20:01:03 +01:00
Michael Telatynski
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770 2021-06-25 15:43:33 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Priit Jõerüüt
39cb5a7058 Translated using Weblate (Estonian) 
Currently translated at 99.8% (2988 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-06-25 13:35:17 +00:00
Andrei
e539b91d58 Translated using Weblate (Romanian) 
Currently translated at 3.6% (110 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ro/
 2021-06-25 13:35:15 +00:00
Ridhubharan
4ce5df2fb5 Translated using Weblate (Tamil) 
Currently translated at 6.7% (202 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ta/
 2021-06-25 13:35:10 +00:00
Kaede
213cd39030 Translated using Weblate (Japanese) 
Currently translated at 77.5% (2322 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-06-25 13:35:01 +00:00
m4sk1n
037ac3ce8d Translated using Weblate (Polish) 
Currently translated at 73.2% (2193 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-06-25 13:34:59 +00:00
rkfg
628c91485b Translated using Weblate (Russian) 
Currently translated at 94.9% (2842 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-06-25 13:34:56 +00:00
Thibault Martin
2ff45339f7 Translated using Weblate (French) 
Currently translated at 100.0% (2993 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-06-25 13:34:52 +00:00
libexus
3f10420503 Translated using Weblate (German) 
Currently translated at 99.6% (2983 of 2993 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-06-25 13:34:48 +00:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Michael Telatynski
a8649ca091 i18n 2021-06-25 11:02:33 +01:00
Michael Telatynski
1c8e24023e Fix space preview for when user cannot join the space 2021-06-25 11:00:27 +01:00
Michael Telatynski
5facee56b0 Fix space settings using join rule private instead of invite 2021-06-25 10:41:45 +01:00
Michael Telatynski
2b9e2e2e85 Fix private space creation setting an alias anyway 2021-06-25 10:41:13 +01:00
Travis Ralston
76caba0385 Restore mx_VoiceMessagePrimaryContainer class 2021-06-25 00:10:32 -06:00
Travis Ralston
d724af600f Remove copy/paste fails 2021-06-24 20:41:00 -06:00
Travis Ralston
c5a72ee6ad Fix arrow seeking 2021-06-24 20:26:40 -06:00
Travis Ralston
ebb6f1b602 Add seeking and notes about clock desync 2021-06-24 20:18:50 -06:00
Robin Townsend
a921d32f44 Fix lint 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-24 18:51:46 -04:00
Robin Townsend
e35e836052 Convert TextualEvent and SearchResultTile to TypeScript 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-24 18:45:23 -04:00
Robin Townsend
f9fe28a6ad Merge branch 't3chguy/ts/8' into text-for-event-perf 2021-06-24 18:45:08 -04:00
Michael Telatynski
231b40473b fix the upset CI 2021-06-24 21:22:56 +01:00
Michael Weimann
086042f078
update message context texts and icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:53 +02:00
Michael Weimann
9a1be63baa
reorder message context menu items 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:52 +02:00
Michael Weimann
c2d51a115b
tweak message context labels 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:52 +02:00
Michael Weimann
ffca23344a
tweak context menu order 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:51 +02:00
Michael Weimann
62efea7e19
add message context menu icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Weimann
e4eeafd485
migrate the message context menu to IconizedContextMenu 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:49 +02:00
Travis Ralston
9c752680ba Tile styling and early behaviour 2021-06-24 13:56:11 -06:00
Michael Telatynski
4492627401 More js-sdk type consolidation 2021-06-24 19:20:02 +01:00
Travis Ralston
aaec9857fd Add optional mark function callback 2021-06-24 11:38:35 -06:00
Travis Ralston
ffef2e58cb Unify audio message types to new media body 2021-06-24 11:38:35 -06:00
Travis Ralston
dda60949c3 Introduce basic audio playback control 2021-06-24 11:38:35 -06:00
Travis Ralston
470778cbb8 Move voice message components to audio-generic directory 2021-06-24 11:38:35 -06:00
Travis Ralston
9f2eba4351 Fix class identifiers 2021-06-24 11:38:35 -06:00
Travis Ralston
50127da227 Replace MAudioBody with a voice message body as a template 2021-06-24 11:38:35 -06:00
Michael Telatynski
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile 2021-06-24 17:05:16 +01:00
Michael Telatynski
3d6c6cea89 Fix AutoHideScrollbar typing 2021-06-24 16:43:12 +01:00
Michael Telatynski
c5a1da49ce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 
 Conflicts:
	src/components/structures/AutoHideScrollbar.tsx
 2021-06-24 16:42:03 +01:00
Michael Telatynski
767b8cd5c7
Merge pull request #6260 from matrix-org/t3chguy/2 
Fix UserInfo not working when rendered without a room
 2021-06-24 16:37:35 +01:00
Michael Telatynski
d83a92959b Fix UserInfo not working when rendered without a room 2021-06-24 16:30:40 +01:00
Šimon Brandner
ff11244de8
Trailing spaces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 17:27:53 +02:00
Šimon Brandner
e282c4aa54
Simplifie code 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-24 17:23:42 +02:00
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Šimon Brandner
cc1f68296e
Iterate 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:58:56 +02:00
Šimon Brandner
dc2f71bee6
Even more fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:55:44 +02:00
Travis Ralston
006c6df205
Merge pull request #6253 from matrix-org/travis/leave-reasons 
Update membership reason handling, including leave reason displaying
 2021-06-24 08:52:34 -06:00
Šimon Brandner
b065f6d1a4
Remove sdk... 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:48:36 +02:00
Šimon Brandner
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile 2021-06-24 16:44:13 +02:00
Šimon Brandner
c0a1127cb7
Fix PowerStatus 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:43:11 +02:00
Šimon Brandner
f08b92309f
Iterate EntityTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 16:35:33 +02:00
Michael Telatynski
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1 2021-06-24 15:23:59 +01:00
Šimon Brandner
8fb788ae56
Iterate EntityTile once more 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:39:51 +02:00
Šimon Brandner
5b21cff240
Iterate MemberTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:38:21 +02:00
Šimon Brandner
1b64cd0c88
Iterate PresenceLabel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:36:22 +02:00
Michael Telatynski
f6bb0f4e75
Merge pull request #6258 from matrix-org/t3chguy/fix/17752 2021-06-24 13:34:45 +01:00
Šimon Brandner
e436e28f01
Make TS happy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:31:04 +02:00
Šimon Brandner
298e505381
Iterate EntityTile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:29:24 +02:00
Michael Telatynski
cc1ff2ce1c Remove unused import 2021-06-24 13:28:16 +01:00
Michael Telatynski
f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list 2021-06-24 13:25:59 +01:00
Šimon Brandner
d2d8cb3c24
Think about what you copy-paste, Simon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:15:44 +02:00
Šimon Brandner
0542c69b66
Fix types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 14:13:27 +02:00