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 |
|
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 |
|
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 |
|
RiotRobot
|
539f892c67
|
Upgrade matrix-js-sdk to 13.0.0
|
2021-09-27 14:55:24 +01:00 |
|
Travis Ralston
|
4a24775fd9
|
Merge pull request #19165 from SimonBrandner/task/usercontent-ts
Convert `/src/usercontent` to TS
|
2021-09-25 23:23:36 -06:00 |
|
Šimon Brandner
|
017e4bd84b
|
Convert index to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-09-24 20:51:02 +02:00 |
|
Dariusz Niemczyk
|
7aff5b2df3
|
Merge pull request #18875 from vector-im/palid/fix/clear-persisted-log-level
Remove accidentally persisted log-level data
|
2021-09-24 11:56:16 +02:00 |
|
Germain Souquet
|
938632a884
|
Merge branch 'develop' into palid/fix/clear-persisted-log-level
|
2021-09-24 10:48:26 +01:00 |
|
RiotRobot
|
b4742373f3
|
v1.8.6-rc.2
|
2021-09-22 14:40:47 +01:00 |
|
RiotRobot
|
730c4e8e3a
|
Prepare changelog for v1.8.6-rc.2
|
2021-09-22 14:40:47 +01:00 |
|
RiotRobot
|
3755aec974
|
Upgrade matrix-react-sdk to 3.31.0-rc.2
|
2021-09-22 14:39:39 +01:00 |
|
RiotRobot
|
66277f7def
|
v1.8.6-rc.1
|
2021-09-21 09:57:10 +01:00 |
|
RiotRobot
|
0b628cf102
|
Prepare changelog for v1.8.6-rc.1
|
2021-09-21 09:57:09 +01:00 |
|
RiotRobot
|
1c393d0044
|
Upgrade matrix-react-sdk to 3.31.0-rc.1
|
2021-09-21 09:53:59 +01:00 |
|
RiotRobot
|
22f6ac1e38
|
Upgrade matrix-js-sdk to 13.0.0-rc.1
|
2021-09-21 09:51:46 +01:00 |
|
David Baker
|
674bba1e15
|
Merge pull request #19105 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
|
2021-09-20 17:44:19 +01:00 |
|
Hassan Sunbul
|
96f8dab224
|
Translated using Weblate (Arabic)
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/ar/
|
2021-09-19 20:25:27 +00:00 |
|
Priit Jõerüüt
|
6774f28cff
|
Translated using Weblate (Estonian)
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/et/
|
2021-09-18 12:25:27 +00:00 |
|
Weblate
|
07887effcc
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-17 11:27:33 +00:00 |
|
Dariusz Niemczyk
|
a9c331edbf
|
Merge pull request #19081 from vector-im/palid/fix-readme
Fix link to README in translation-docs again
|
2021-09-17 13:27:29 +02:00 |
|
Dariusz Niemczyk
|
79c4b95824
|
Fix link to README in translation-docs again
|
2021-09-17 13:19:38 +02:00 |
|
Weblate
|
3fd49628a2
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-17 11:03:52 +00:00 |
|
Dariusz Niemczyk
|
122664433f
|
Merge pull request #19080 from vector-im/palid/fix-readme
Fix broken readme link
|
2021-09-17 13:03:48 +02:00 |
|
Dariusz Niemczyk
|
1dcdd549d0
|
Fix broken readme link
|
2021-09-17 12:58:19 +02:00 |
|
Dariusz Niemczyk
|
0a87baf99d
|
Remove accidentally persisted log-level data
This commit gets rid of log-level data in localStorage which in some
extreme cases could fill up the entire localStorage making the app
unusable
Followup to https://github.com/matrix-org/matrix-js-sdk/pull/1880
|
2021-09-16 14:51:32 +02:00 |
|
Weblate
|
65acbc51c6
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-16 09:16:28 +00:00 |
|
Michael Telatynski
|
1aa2efd2ce
|
Merge pull request #18490 from vector-im/t3chguy/fix/18088
|
2021-09-16 10:16:23 +01:00 |
|
Weblate
|
a57af54706
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-16 07:59:02 +00:00 |
|
Michael Telatynski
|
44a67ee383
|
Merge pull request #19037 from vector-im/t3chguy/fix/18481
|
2021-09-16 08:58:57 +01:00 |
|
Weblate
|
88428b9835
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-15 17:44:58 +00:00 |
|
Travis Ralston
|
72e4197db8
|
Merge pull request #19038 from vector-im/travis/be-better
Encourage false positives of the error dialog to result in tickets
|
2021-09-15 11:44:54 -06:00 |
|
Weblate
|
2c6fa9707b
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-15 16:53:17 +00:00 |
|
jelv
|
3f086578b0
|
Translated using Weblate (Dutch)
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/nl/
|
2021-09-15 16:53:17 +00:00 |
|
David Baker
|
446c4f991f
|
Merge pull request #19056 from vector-im/dbkr/yarnupgrade_20210914
yarn upgrade
|
2021-09-15 17:53:13 +01:00 |
|
David Baker
|
73a05d35bd
|
Merge remote-tracking branch 'origin/develop' into dbkr/yarnupgrade_20210914
|
2021-09-15 17:15:25 +01:00 |
|
David Baker
|
f4a11b8509
|
yarn upgrade
and pin types as per https://github.com/matrix-org/matrix-react-sdk/pull/6813
|
2021-09-15 17:12:16 +01:00 |
|
Weblate
|
8f3c0be388
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-15 09:18:33 +00:00 |
|
Kat Gerasimova
|
4f0c3bf4ff
|
Merge pull request #18896 from kittykat/issue-automation
Issue labelling and process home updates
|
2021-09-15 10:18:28 +01:00 |
|
Weblate
|
46b7f2356e
|
Merge branch 'origin/develop' into Weblate.
|
2021-09-14 20:50:34 +00:00 |
|
Travis Ralston
|
574e848bf3
|
Merge branch 'master' into develop
|
2021-09-14 14:50:07 -06:00 |
|
Travis Ralston
|
75b1d813f1
|
Encourage false positives of the error dialog to result in tickets
|
2021-09-14 12:33:14 -06:00 |
|
RiotRobot
|
c7aab2530b
|
Merge branch 'release-v1.8.5'
|
2021-09-14 16:18:17 +01:00 |
|