Commit graph

38711 commits

Author SHA1 Message Date
Michael Telatynski
5eaf0e7e25
Merge pull request #6081 from jaiwanth-v/export-conversations 2021-09-30 12:49:24 +01:00
Jaiwanth
e0267258a4 Initialize css string 2021-09-30 16:24:31 +05:30
Michael Telatynski
6454aa7a95 Update copy 2021-09-30 11:46:05 +01:00
Andrew Ferrazzutti
71851d8075 Check error message for room publish failure
Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-09-29 19:01:14 -04:00
Jaiwanth
d264f5f98e Change js-sdk import style 2021-09-29 20:55:09 +05:30
Weblate
25cfd31265 Merge branch 'origin/develop' into Weblate. 2021-09-29 15:06:26 +00:00
Michael Telatynski
c23e698d22
Merge pull request #6885 from matrix-org/t3chguy/fix/19030 2021-09-29 16:06:22 +01:00
Weblate
9101b93ded Merge branch 'origin/develop' into Weblate. 2021-09-29 15:06:19 +00:00
Michael Telatynski
fbf74bea1b
Merge pull request #6886 from matrix-org/t3chguy/fix/19223 2021-09-29 16:06:14 +01:00
Michael Telatynski
0697470cc8 Update copy 2021-09-29 16:05:03 +01:00
Weblate
3684109da4 Merge branch 'origin/develop' into Weblate. 2021-09-29 14:10:59 +00:00
Michael Telatynski
7e47211d4f
Merge pull request #6878 from matrix-org/t3chguy/fix/19192 2021-09-29 15:10:54 +01:00
Jaiwanth
6ccb7e9145 Space after brand 2021-09-29 19:37:31 +05:30
Michael Telatynski
c0b6c001ca Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19192 2021-09-29 15:04:14 +01:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski
56745f29c0 Fix spaces null-guard breaking the dispatcher settings watching 2021-09-29 15:01:58 +01:00
Michael Telatynski
ad5842c87a Allow closing Dropdown via its chevron 2021-09-29 14:24:12 +01:00
Weblate
b97e076ee2 Merge branch 'origin/develop' into Weblate. 2021-09-29 13:19:59 +00:00
Michael Telatynski
f7fba91387
Merge pull request #6883 from matrix-org/t3chguy/fix/19067 2021-09-29 14:19:55 +01:00
Michael Telatynski
0056b282a6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19067 2021-09-29 14:13:04 +01:00
Weblate
bd4e313140 Merge branch 'origin/develop' into Weblate. 2021-09-29 13:06:31 +00:00
Michael Telatynski
f75af2da54
Merge pull request #6881 from matrix-org/t3chguy/fix/18975 2021-09-29 14:06:26 +01:00
Michael Telatynski
d7aaeb37b9 delint 2021-09-29 14:05:31 +01:00
Michael Telatynski
d6cab320e9 Fix space invite edge cases 2021-09-29 14:04:02 +01:00
Weblate
0eb3a98bfc Merge branch 'origin/develop' into Weblate. 2021-09-29 11:29:21 +00:00
Germain
c3bac33b9d
Merge pull request #6880 from matrix-org/rav/fix_autoscroll 2021-09-29 12:29:17 +01:00
Michael Telatynski
21e93febb6 i18n 2021-09-29 11:54:03 +01:00
Weblate
633f3d2f70 Merge branch 'origin/develop' into Weblate. 2021-09-29 10:53:16 +00:00
jelv
c9915421f8 Translated using Weblate (Dutch)
Currently translated at 100.0% (3168 of 3168 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-09-29 10:53:16 +00:00
Michael Telatynski
0e79daee4b Remove stale new in the spaces beta toast & modal 2021-09-29 11:53:13 +01:00
Michael Telatynski
a811df4786
Merge pull request #6882 from andybalaam/remove-extra-word 2021-09-29 11:53:09 +01:00
Michael Telatynski
af8c07a69b Ensure that sub-spaces aren't considered for notification badges 2021-09-29 11:45:27 +01:00
Andy Balaam
842ab0af05 Remove extra 'are' in README
Signed-off-by: Andy Balaam <andyb@element.io>
2021-09-29 11:41:37 +01:00
Richard van der Hoff
c99216814f fix lint 2021-09-29 11:20:51 +01:00
Richard van der Hoff
b285315cb8 Fix ScrollPanel.isAtBottom for non-standard DPI settings 2021-09-29 11:16:41 +01:00
Weblate
ae6b142c84 Merge branch 'origin/develop' into Weblate. 2021-09-29 09:05:59 +00:00
random
e135d0e0b3 Translated using Weblate (Italian)
Currently translated at 99.9% (3167 of 3168 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2021-09-29 09:05:59 +00:00
jelv
d91116134d Translated using Weblate (Dutch)
Currently translated at 100.0% (3168 of 3168 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-09-29 09:05:56 +00:00
libexus
e24924e3d6 Translated using Weblate (German)
Currently translated at 99.1% (3141 of 3168 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-09-29 09:05:55 +00:00
Michael Telatynski
399ceaf002
Merge pull request #6879 from matrix-org/t3chguy/fix/19164 2021-09-29 10:05:43 +01:00
Michael Telatynski
02c5b7e28d Pluck out some more applicable styles 2021-09-28 16:36:25 +01:00
Michael Telatynski
4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
Michael Telatynski
886f8d31fb Iterate title on confirm space action dialog 2021-09-28 16:23:42 +01:00
Michael Telatynski
0f8069ac35 Switch ConfirmUserActionDialog over to using a Field 2021-09-28 16:22:27 +01:00
Michael Telatynski
2ac2358d93 Fix avatar getting chopped off 2021-09-28 16:22:05 +01:00
Michael Telatynski
207a1143fc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-09-28 15:45:09 +01:00
Michael Telatynski
d7c43c7cf8 Fix space children without specific order being sorted after those with one 2021-09-28 15:42:51 +01:00
Weblate
041781e0ec Merge branch 'origin/develop' into Weblate. 2021-09-28 14:07:41 +00:00
Germain
ca3b8e596a
Merge pull request #6873 from matrix-org/gsouquet/threads-action-bar-19127 2021-09-28 15:07:36 +01:00
Weblate
9d54c106d5 Merge branch 'origin/develop' into Weblate. 2021-09-28 14:04:40 +00:00