Commit graph

11201 commits

Author SHA1 Message Date
RiotRobot
46e526c038 Reset matrix-react-sdk back to develop branch 2021-10-12 09:10:54 +01:00
RiotRobot
613c04d984 Reset matrix-js-sdk back to develop branch 2021-10-12 09:10:42 +01:00
RiotRobot
403c851461 Merge branch 'release-v1.9.2' 2021-10-12 09:07:34 +01:00
RiotRobot
1cf095a3e1 v1.9.2 2021-10-12 08:59:57 +01:00
RiotRobot
2deee7a709 Prepare changelog for v1.9.2 2021-10-12 08:59:56 +01:00
RiotRobot
50a2badd96 Upgrade matrix-react-sdk to 3.32.1 2021-10-12 08:57:57 +01:00
RiotRobot
df3647f139 Upgrade matrix-js-sdk to 14.0.1 2021-10-12 08:57:01 +01:00
RiotRobot
971f4bbb4d Merge branch 'master' into develop 2021-10-11 12:19:01 +01:00
RiotRobot
afe8e878a5 v1.9.1 2021-10-11 12:08:26 +01:00
RiotRobot
8e486c3f98 Prepare changelog for v1.9.1 2021-10-11 12:08:26 +01:00
RiotRobot
2ef743e5ee Upgrade matrix-react-sdk to 3.32.0 2021-10-11 12:06:09 +01:00
RiotRobot
a605657ebe Upgrade matrix-js-sdk to 14.0.0 2021-10-11 12:05:18 +01:00
RiotRobot
5fff0fb677 v1.9.1-rc.2 2021-10-08 08:42:53 +01:00
RiotRobot
721670d57e Prepare changelog for v1.9.1-rc.2 2021-10-08 08:42:52 +01:00
RiotRobot
74669e178c Upgrade matrix-react-sdk to 3.32.0-rc.2 2021-10-08 08:40:49 +01:00
RiotRobot
7bc016dbea Upgrade matrix-js-sdk to 14.0.0-rc.2 2021-10-08 08:40:24 +01:00
Germain
90ada74daf
Merge pull request #19307 from vector-im/gsouquet/fix-dependabots-cve 2021-10-07 09:28:36 +01:00
Germain Souquet
efeb9cb1d5 Fix @types/jest version 2021-10-06 10:01:52 +01:00
Germain Souquet
b1627461a7 Upgrade to Jest 27.2.4
Jest 27 release blog post: jestjs.io/blog/2021/05/25/jest-27

Removes deprecated jest-environment-jsdom-sixteen
2021-10-06 09:58:47 +01:00
Germain Souquet
5f236f0224 Upgrade to Jest 27 2021-10-06 09:33:23 +01:00
Ekaterina Gerasimova
20c4c2fcd3 Improve wording for outcome section of bug template
Based off vector-im/element-android/pull/4076, trying out slightly
different wording

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
2021-10-05 14:19:12 +01:00
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