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

9695 commits

Author SHA1 Message Date
Michael Telatynski
d615952337 Add fallback warning 2021-09-17 16:02:12 +01:00
Michael Telatynski
1858c63c4a Allow options to cascade kicks/bans throughout spaces 2021-09-17 15:34:49 +01:00
Michael Telatynski
28bc8010a7 Say Joining space instead of Joining room where we know its a space 2021-09-16 11:20:01 +01:00
Michael Telatynski
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Michael Telatynski
bbc8e4da23
Merge pull request #6594 from matrix-org/t3chguy/fix/18088 2021-09-16 10:16:33 +01:00
Michael Telatynski
b052d0730d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858 2021-09-16 10:15:43 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Šimon Brandner
a571460871
Use a universal copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-15 15:30:23 +02:00
Šimon Brandner
8094a34384
Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-15 15:28:05 +02:00
Michael Telatynski
b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Michael Telatynski
ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Michael Telatynski
41676b4a9b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891 2021-09-10 11:09:52 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Germain Souquet
b5bed32973 Fix i18n 2021-09-09 13:40:07 +01:00
Germain Souquet
07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00
Michael Telatynski
630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-09-09 11:01:11 +01:00
Michael Telatynski
d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528 
Improve tooltips on space quick actions and explore button
 2021-09-08 22:59:52 +01:00
Michael Telatynski
086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018 
Make space members and user info behave more expectedly
 2021-09-08 22:59:44 +01:00
Michael Telatynski
600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Michael Telatynski
d4bac4752d Make space members and user info behave more expectedly 2021-09-08 13:34:26 +01:00
Michael Telatynski
1da65d459c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18597 2021-09-08 12:57:37 +01:00
Michael Telatynski
8bd1f384b9 Improve tooltips on space quick actions and explore button 2021-09-08 10:16:20 +01:00
Germain Souquet
bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
Germain Souquet
2d45bfb976 Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-07 15:39:32 +01:00
David Baker
f25be9770e Translated using Weblate (Albanian) 
Currently translated at 99.7% (3142 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-07 09:28:16 +00:00
XoseM
459f603f17 Translated using Weblate (Galician) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-09-07 08:40:43 +00:00
jelv
571e7de795 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-07 08:40:38 +00:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer"" 2021-09-06 22:11:35 -06:00
Weblate
2869a802ec Merge branch 'origin/develop' into Weblate. 2021-09-07 04:09:05 +00:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer" 2021-09-06 22:08:50 -06:00
Weblate
8ce3c168ca Merge branch 'origin/develop' into Weblate. 2021-09-07 04:07:11 +00:00
Ihor Hordiichuk
54b466a97f Translated using Weblate (Ukrainian) 
Currently translated at 51.5% (1624 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-07 04:07:11 +00:00
Jeff Huang
7099d35439 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-07 04:07:08 +00:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533 2021-09-07 05:07:00 +01:00
Alexandre Franke
e450750700 Translated using Weblate (French) 
Currently translated at 99.9% (3148 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-06 15:53:19 +00:00
Priit Jõerüüt
b4b3a4bc17 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3148 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-06 15:21:02 +00:00
waclaw66
da0714917f Translated using Weblate (Czech) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-06 15:20:59 +00:00
Michael Telatynski
68836b9c68 hide no-op m.room.encryption events and better word param changes 2021-09-06 14:59:30 +01:00
Thibault Martin
8ee49129b8 Translated using Weblate (French) 
Currently translated at 99.9% (3148 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-09-06 12:06:49 +00:00
Szimszon
6e57d06bb4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-06 12:06:46 +00:00
sr093906
582d12b5cd Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3151 of 3151 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-06 12:06:43 +00:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Weblate
28db6d6a03 Merge branch 'origin/develop' into Weblate. 2021-09-06 10:40:59 +00:00
Michael Telatynski
6801ec76a7
Merge pull request #6738 from matrix-org/t3chguy/fix/18780 2021-09-06 11:40:55 +01:00