Commit graph

8836 commits

Author SHA1 Message Date
Hivaa
425806c5a3 Translated using Weblate (Persian)
Currently translated at 22.2% (663 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 06:26:29 +00:00
HKalbasi
c2c1dd08a3 Translated using Weblate (Persian)
Currently translated at 22.2% (661 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 06:24:52 +00:00
Hivaa
d08696b7de Translated using Weblate (Persian)
Currently translated at 22.2% (661 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 06:24:50 +00:00
HKalbasi
e39f0fb2e5 Translated using Weblate (Persian)
Currently translated at 21.5% (642 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:58:17 +00:00
Hivaa
da1b961bb9 Translated using Weblate (Persian)
Currently translated at 21.5% (642 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:58:17 +00:00
HKalbasi
9f414d3716 Translated using Weblate (Persian)
Currently translated at 21.5% (641 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:57:45 +00:00
Hivaa
2746721ac2 Translated using Weblate (Persian)
Currently translated at 21.5% (641 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:57:45 +00:00
HKalbasi
8bc9ac0416 Translated using Weblate (Persian)
Currently translated at 21.5% (640 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:57:07 +00:00
Hivaa
46645c0d8c Translated using Weblate (Persian)
Currently translated at 21.5% (640 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:57:07 +00:00
HKalbasi
0a580e8122 Translated using Weblate (Persian)
Currently translated at 21.4% (639 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:56:26 +00:00
Hivaa
4b0de5060e Translated using Weblate (Persian)
Currently translated at 21.4% (639 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:56:26 +00:00
HKalbasi
4f29fc78a0 Translated using Weblate (Persian)
Currently translated at 21.2% (633 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:53:23 +00:00
Hivaa
924afbe3d8 Translated using Weblate (Persian)
Currently translated at 21.2% (633 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:53:23 +00:00
HKalbasi
72248a7643 Translated using Weblate (Persian)
Currently translated at 21.1% (628 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:50:50 +00:00
Hivaa
7e197d4d68 Translated using Weblate (Persian)
Currently translated at 21.1% (628 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-22 05:50:49 +00:00
Michael Telatynski
35b9388fc2 Iterate PR 2021-05-21 13:37:21 +01:00
c-cal
431b4607a4 Translated using Weblate (French)
Currently translated at 99.7% (2966 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-21 05:23:47 +00:00
Robin Townsend
332412782e Remove logo spinner
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Michael Telatynski
aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Šimon Brandner
4cbec87092
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 15:21:22 +02:00
Weblate
ad951be843 Merge branch 'origin/develop' into Weblate. 2021-05-19 12:35:55 +00:00
Hivaa
0a018500e2 Translated using Weblate (Persian)
Currently translated at 21.0% (625 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-19 12:35:52 +00:00
Fake Mail
575e27ea0e Translated using Weblate (Bulgarian)
Currently translated at 87.6% (2601 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
2021-05-19 09:36:59 +00:00
Hivaa
5ea4f91654 Translated using Weblate (Persian)
Currently translated at 20.2% (602 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-19 09:36:47 +00:00
jelv
9f4c75fd4f Translated using Weblate (Dutch)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-05-19 09:36:46 +00:00
Šimon Brandner
17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 08:46:33 +02:00
Hivaa
da3e0a4cb4 Translated using Weblate (Persian)
Currently translated at 20.2% (601 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-05-18 16:57:23 +00:00
LinAGKar
90c660a74f Translated using Weblate (Swedish)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2021-05-18 16:57:22 +00:00
Thibault Martin
8eb0a8b3b5 Translated using Weblate (French)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-18 16:57:20 +00:00
libexus
00024c794c Translated using Weblate (German)
Currently translated at 99.6% (2958 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-18 16:57:18 +00:00
Michael Telatynski
367ad1583d
Merge pull request #6053 from matrix-org/t3chguy/fix/17338
Add space invaders chat effect
2021-05-18 12:14:40 +01:00
Michael Telatynski
b5a612cd0f Add space invaders chat effect 2021-05-18 10:29:10 +01:00
Michael Telatynski
f87f0704b9 i18n 2021-05-18 09:42:35 +01:00
Trendyne
34f902229e Translated using Weblate (Icelandic)
Currently translated at 22.1% (656 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
2021-05-17 19:50:30 +00:00
XoseM
f3e8d137de Translated using Weblate (Galician)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-05-17 19:50:05 +00:00
waclaw66
0e2ddec7a3 Translated using Weblate (Czech)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-05-17 19:50:03 +00:00
Kaede
af5bc71602 Translated using Weblate (Japanese)
Currently translated at 77.4% (2300 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2021-05-17 19:49:59 +00:00
Andrejs
3c526be5de Translated using Weblate (Latvian)
Currently translated at 49.5% (1470 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lv/
2021-05-17 19:49:54 +00:00
Jeff Huang
0aa666693f Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-05-17 19:49:52 +00:00
LinAGKar
fc4ee0df4b Translated using Weblate (Swedish)
Currently translated at 99.9% (2966 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2021-05-17 19:49:48 +00:00
jelv
5e0db72582 Translated using Weblate (Dutch)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-05-17 19:49:40 +00:00
Thibault Martin
b48be43a2f Translated using Weblate (French)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-17 19:49:37 +00:00
Thomas Citharel
9d538614c4 Translated using Weblate (French)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-17 19:49:36 +00:00
iaiz
ba5a769a60 Translated using Weblate (Spanish)
Currently translated at 99.9% (2966 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-05-17 19:49:33 +00:00
libexus
fa77bd91bb Translated using Weblate (German)
Currently translated at 98.9% (2937 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-17 19:49:29 +00:00
Travis Ralston
5093657c71 Remove "read" level language for new API scope 2021-05-14 14:17:10 -06:00
Travis Ralston
98b2e120a7 Merge branch 'develop' into travis/msc2876 2021-05-14 14:09:57 -06:00
Aaron Raimist
b834ac8a08 Translated using Weblate (Estonian)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-05-14 17:19:12 +00:00
Priit Jõerüüt
159693fc47 Translated using Weblate (Estonian)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-05-14 17:19:12 +00:00
Trendyne
779972ea51 Translated using Weblate (Icelandic)
Currently translated at 16.2% (481 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
2021-05-14 17:19:08 +00:00
Aaron Raimist
bf5e07db88 Translated using Weblate (Albanian)
Currently translated at 99.7% (2961 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-05-14 17:18:58 +00:00
Besnik Bleta
7e1f5625fa Translated using Weblate (Albanian)
Currently translated at 99.7% (2961 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-05-14 17:18:57 +00:00
Aaron Raimist
9cc2465787 Translated using Weblate (Galician)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-05-14 17:18:49 +00:00
XoseM
126077a678 Translated using Weblate (Galician)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-05-14 17:18:48 +00:00
Aaron Raimist
d862df9f05 Translated using Weblate (Czech)
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-05-14 17:18:45 +00:00
Aaron Raimist
1b67e68061 Translated using Weblate (Italian)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2021-05-14 17:18:43 +00:00
random
00508faf9d Translated using Weblate (Italian)
Currently translated at 100.0% (2968 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2021-05-14 17:18:43 +00:00
Aaron Raimist
fc3d56cdc3 Translated using Weblate (Chinese (Traditional))
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-05-14 17:18:39 +00:00
Aaron Raimist
6e47f968fa Translated using Weblate (Swedish)
Currently translated at 98.4% (2922 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
2021-05-14 17:18:37 +00:00
Aaron Raimist
57d3c525e2 Translated using Weblate (Dutch)
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-05-14 17:18:35 +00:00
Aaron Raimist
6def74a418 Translated using Weblate (Hungarian)
Currently translated at 99.8% (2965 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-05-14 17:18:34 +00:00
Szimszon
59144ac935 Translated using Weblate (Hungarian)
Currently translated at 99.8% (2965 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-05-14 17:18:33 +00:00
Aaron Raimist
d74ab2a4f9 Translated using Weblate (French)
Currently translated at 99.5% (2956 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-14 17:18:30 +00:00
Aaron Raimist
796306fa8f Translated using Weblate (Spanish)
Currently translated at 99.4% (2953 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-05-14 17:18:28 +00:00
Aaron Raimist
2d74ee722a Translated using Weblate (English (United States))
Currently translated at 19.7% (585 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/en_US/
2021-05-14 17:18:26 +00:00
Aaron Raimist
0642952d5f Translated using Weblate (German)
Currently translated at 98.8% (2935 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-14 17:18:26 +00:00
libexus
08d855c8b9 Translated using Weblate (German)
Currently translated at 98.8% (2935 of 2968 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-14 17:18:25 +00:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski
034bd9cb02
Merge pull request #6029 from matrix-org/t3chguy/fix/17275
Show alternative button during space creation wizard if no rooms
2021-05-14 10:48:39 +01:00
Michael Telatynski
e1df62472d remove unused imports and run i18n 2021-05-14 10:48:24 +01:00
Weblate
14aa5c20d0 Merge branch 'origin/develop' into Weblate. 2021-05-14 04:37:46 +00:00
Trendyne
3f9ef015c7 Translated using Weblate (Icelandic)
Currently translated at 13.7% (407 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/is/
2021-05-14 04:37:45 +00:00
XoseM
c5093cafad Translated using Weblate (Galician)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-05-14 04:37:44 +00:00
random
7248f28278 Translated using Weblate (Italian)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2021-05-14 04:37:36 +00:00
libexus
f595813e21 Translated using Weblate (German)
Currently translated at 99.1% (2935 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-14 04:37:29 +00:00
Jaiwanth
26dd6d5510 Swap rotate left and right buttons
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-14 08:26:29 +05:30
Travis Ralston
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation
Typo: initilisation -> initialisation
2021-05-13 20:15:08 -06:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski
2f28de8472 Show alternative button during space creation wizard if user opted to create 0 rooms 2021-05-13 13:22:50 +01:00
Michael Telatynski
b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Priit Jõerüüt
68fcc259d0 Translated using Weblate (Estonian)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-05-12 20:28:27 +00:00
waclaw66
3169f75e90 Translated using Weblate (Czech)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-05-12 20:28:19 +00:00
Jeff Huang
9e981ae118 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-05-12 20:28:11 +00:00
jelv
7be918f527 Translated using Weblate (Dutch)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-05-12 20:28:03 +00:00
Szimszon
61f90cdc45 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-05-12 20:27:55 +00:00
Thibault Martin
93ca9e6891 Translated using Weblate (French)
Currently translated at 100.0% (2959 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-05-12 20:27:48 +00:00
iaiz
bf9dd05b3c Translated using Weblate (Spanish)
Currently translated at 99.8% (2956 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-05-12 20:27:41 +00:00
libexus
c9988d59a1 Translated using Weblate (German)
Currently translated at 99.3% (2939 of 2959 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-05-12 20:27:33 +00:00
Michael Telatynski
236fcecf9c i18n 2021-05-12 17:13:23 +01:00
Michael Telatynski
607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski
ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238
Add feedback mechanism for beta features, namely Spaces
2021-05-11 17:46:21 +01:00
Michael Telatynski
7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Travis Ralston
92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev 2021-05-11 10:13:21 -06:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Weblate
350b5e37d3 Merge branch 'origin/develop' into Weblate. 2021-05-11 15:26:43 +00:00
Michael Telatynski
bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Michael Telatynski
6ece4ef2ab i18n 2021-05-11 14:08:09 +01:00
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski
f0342b0ea7
Merge pull request #6009 from matrix-org/t3chguy/fix/15359
Improve permissions error when adding new server to room directory
2021-05-11 12:36:40 +01:00
Michael Telatynski
b0f23aa65b Improve permissions error when adding new server to room directory 2021-05-11 12:20:18 +01:00