Commit Graph

11230 Commits (75eab660c298d3a47803b7b51c5d4a824bc50315)

Author SHA1 Message Date
Ekaterina Gerasimova a98942e0c8 Improve wording around rageshakes on issue template
Issue #18985

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
2021-10-05 14:19:12 +01:00
Germain Souquet 88030330f1 Update dependencies 2021-10-04 12:31:36 +01:00
RiotRobot 64fa84fc60 v1.9.1-rc.1 2021-10-04 12:09:38 +01:00
RiotRobot 72c9a6f437 Prepare changelog for v1.9.1-rc.1 2021-10-04 12:09:37 +01:00
RiotRobot 8be55d8dcf Upgrade matrix-react-sdk to 3.32.0-rc.1 2021-10-04 12:08:08 +01:00
RiotRobot 107d8f6fb8 Upgrade matrix-js-sdk to 14.0.0-rc.1 2021-10-04 12:07:42 +01:00
Germain 49076a8a06
Merge pull request #19267 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-10-04 11:46:25 +01:00
Weblate 1571df1c82 Merge branch 'origin/develop' into Weblate. 2021-10-01 14:49:01 +00:00
Dariusz Niemczyk 4efa0b215f
Add typescript support and fix tests after threads work (#19247)
* Typescriptify tests
* Fix tests after threads work
* Add proper types for jest
2021-10-01 15:48:57 +01:00
Weblate b953ad3353 Merge branch 'origin/develop' into Weblate. 2021-10-01 13:47:33 +00:00
Dariusz Niemczyk fe9d0189a0
Revert "Typescriptify tests"
This reverts commit 2a4dcd1267.
2021-10-01 15:41:32 +02:00
Dariusz Niemczyk 5192f344b1
Revert "Add missing jest types"
This reverts commit 04ee4d6137.
2021-10-01 15:41:30 +02:00
Dariusz Niemczyk ef436b8fa7
Revert "Fix joining-test"
This reverts commit ecf29d9409.
2021-10-01 15:41:28 +02:00
Dariusz Niemczyk e15d27b316
Revert "Fix loading-test"
This reverts commit 155d80b3fa.
2021-10-01 15:41:25 +02:00
Dariusz Niemczyk 935f95fcde
Revert "Fix typescript errors"
This reverts commit 37a0957285.
2021-10-01 15:41:22 +02:00
Weblate e39b6e3057 Merge branch 'origin/develop' into Weblate. 2021-10-01 13:22:53 +00:00
Dariusz Niemczyk 37a0957285
Fix typescript errors 2021-10-01 15:22:46 +02:00
Dariusz Niemczyk 155d80b3fa
Fix loading-test 2021-10-01 15:18:50 +02:00
Dariusz Niemczyk ecf29d9409
Fix joining-test 2021-10-01 15:18:42 +02:00
Dariusz Niemczyk 04ee4d6137
Add missing jest types 2021-10-01 15:18:29 +02:00
Dariusz Niemczyk 2a4dcd1267
Typescriptify tests 2021-10-01 14:56:07 +02:00
Weblate 9a8ba41510 Merge branch 'origin/develop' into Weblate. 2021-09-30 15:26:18 +00:00
Germain 249cb4d169
Merge pull request #19234 from maxkratz/hotfix/remove-ios-jitsi-notice
Removed iOS app Jitsi homeserver URL notice in the documentation
2021-09-30 16:26:14 +01:00
Maximilian Kratz 0142bb04e4 Removed iOS Jitsi notice 2021-09-30 13:50:43 +02:00
Weblate 6dca9c60f0 Merge branch 'origin/develop' into Weblate. 2021-09-30 11:49:33 +00:00
Michael Telatynski 564d427be7
Merge pull request #18257 from jaiwanth-v/export-conversations 2021-09-30 12:49:27 +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
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 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
James Salter e7caa54e59 Remove superfluous index.htm 2021-09-29 11:46:44 +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
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
James Salter 237bc51cd1 Remove commented out cruft 2021-09-28 13:25:43 +01:00
James Salter b4187c6150 Fix rule 2021-09-28 13:24:54 +01:00
James Salter 212138b017 Fix path 2021-09-28 13:24:44 +01:00
James Salter 77ceff07d5 Merge remote-tracking branch 'origin' into add-cache-control-nginx 2021-09-28 12:16:10 +01:00
James Salter a3c4fac375 Use custom nginx conf 2021-09-28 12:15:34 +01:00
Weblate 470ab22e2d Merge branch 'origin/develop' into Weblate. 2021-09-27 14:16:33 +00:00
RiotRobot cf5cbb1ff9 Reset matrix-react-sdk back to develop branch 2021-09-27 15:16:28 +01:00
RiotRobot 6590debbc6 Reset matrix-js-sdk back to develop branch 2021-09-27 15:16:18 +01:00
Weblate 63379f41b9 Merge branch 'origin/develop' into Weblate. 2021-09-27 14:12:38 +00:00
Andrejs 1ddbed74d3 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-27 14:12:38 +00:00
RiotRobot 9ac0d2c756 Merge branch 'master' into develop 2021-09-27 15:11:16 +01:00
RiotRobot bd96d29966 v1.9.0 2021-09-27 14:58:14 +01:00
RiotRobot c3cc9f20f5 Prepare changelog for v1.9.0 2021-09-27 14:58:14 +01:00
RiotRobot 46769046da Upgrade matrix-react-sdk to 3.31.0 2021-09-27 14:55:53 +01:00