Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaiwanth dbecdc4f14 Merge branch 'develop' of https://github.com/vector-im/element-web into export-conversations 2021-09-29 19:21:15 +05:30
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 3f037a05d0 Merge branch 'origin/develop' into Weblate. 2021-09-29 12:17:17 +00:00
James Salter e90f7b7e82 Merge pull request #18979 from vector-im/readme-no-cache 
Suggest setting Cache-Control: no-cache on / for self-hosters
 2021-09-29 13:17:14 +01:00
James Salter 5741baed25 Note that caching is configured in he Dockerfile 2021-09-29 13:14:03 +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
Weblate c964391c4f Merge branch 'origin/develop' into Weblate. 2021-09-29 10:56:19 +00:00
James Salter b48561d34f Merge pull request #19220 from vector-im/remove-htm 
Remove superfluous index.htm
 2021-09-29 11:56:16 +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
James Salter e7caa54e59 Remove superfluous index.htm 2021-09-29 11:46:44 +01:00
Michael Telatynski af8c07a69b Ensure that sub-spaces aren't considered for notification badges 2021-09-29 11:45:27 +01:00
Weblate cea07479ec Merge branch 'origin/develop' into Weblate. 2021-09-29 10:44:55 +00:00
James Salter 54c2e8fc8e Merge pull request #19203 from vector-im/add-cache-control-nginx 
Return cache-control: no-cache from Docker nginx for /
 2021-09-29 11:44:49 +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
Andrejs 5553cdf329 Translated using Weblate (Latvian) 
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/
 2021-09-29 06:25:31 +00:00
jelv 69c946132d Added translation using Weblate (Dutch) 2021-09-28 19:14:32 +00: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
James Salter 74a3e4fd8b Merge pull request #267 from vector-im/electron-13-5 
Update to Electron 13.5
 2021-09-28 16:23:18 +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
James Salter 048b7932bd Update electronVersion 2021-09-28 15:29:03 +01:00