Commit graph

12490 commits

Author SHA1 Message Date
Weblate
decbd0aa04 Merge branch 'origin/develop' into Weblate. 2023-04-11 13:26:47 +00:00
RiotRobot
cdabefa285 Reset matrix-js-sdk back to develop branch 2023-04-11 14:26:21 +01:00
RiotRobot
8b1d3a1265 Reset matrix-react-sdk back to develop branch 2023-04-11 14:25:55 +01:00
Weblate
dcb9dec749 Merge branch 'origin/develop' into Weblate. 2023-04-11 13:24:20 +00:00
RiotRobot
b9fd456bf4 Merge branch 'master' into develop
# Conflicts:
#	yarn.lock
2023-04-11 14:21:47 +01:00
RiotRobot
c1371fee27 v1.11.29 2023-04-11 14:13:24 +01:00
RiotRobot
a4b10a8766 Prepare changelog for v1.11.29 2023-04-11 14:13:23 +01:00
RiotRobot
80b9f7baab Upgrade matrix-react-sdk to 3.70.0 2023-04-11 14:11:26 +01:00
RiotRobot
d26d56e579 Upgrade matrix-js-sdk to 24.1.0 2023-04-11 14:11:08 +01:00
Weblate
ddc65d5cff Merge branch 'origin/develop' into Weblate. 2023-04-11 11:22:55 +00:00
renovate[bot]
22e3ebd89a
Lock file maintenance (#25075)
* Lock file maintenance

* Lock file maintenance

* Pin jest-canvas-mock

* Pin jest-canvas-mock

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-04-11 12:22:49 +01:00
Weblate
8a54f74589 Merge branch 'origin/develop' into Weblate. 2023-04-06 12:17:55 +00:00
renovate[bot]
1ebe574ab1
Update dependency typescript to v5 (#25050)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-04-06 13:17:51 +01:00
Weblate
0714d74956 Merge branch 'origin/develop' into Weblate. 2023-04-06 11:45:44 +00:00
renovate[bot]
6cfa1eea7b
Update all non-major dependencies (#25045)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-06 11:45:39 +00:00
Weblate
892ee3a707 Merge branch 'origin/develop' into Weblate. 2023-04-06 11:18:41 +00:00
renovate[bot]
2df33458a1
Update dependency stylelint-config-standard to v32 (#25049)
* Update dependency stylelint-config-standard to v32

* Iterate

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2023-04-06 12:18:35 +01:00
Weblate
27dc1fb1ef Merge branch 'origin/develop' into Weblate. 2023-04-06 10:44:07 +00:00
renovate[bot]
88ade4a995
Update dependency @types/react to v17.0.55 (#25044)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-06 10:44:01 +00:00
Weblate
7899cd3077 Merge branch 'origin/develop' into Weblate. 2023-04-06 09:57:15 +00:00
renovate[bot]
3182508238
Update definitelyTyped (#25043)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-06 09:57:10 +00:00
Weblate
1237e73c1b Merge branch 'origin/develop' into Weblate. 2023-04-06 09:41:36 +00:00
Michael Telatynski
04f2a55500
Update pull_request.yaml 2023-04-06 10:41:32 +01:00
Weblate
04cf98d0e5 Merge branch 'origin/develop' into Weblate. 2023-04-06 09:13:22 +00:00
renovate[bot]
1a34ded0a1
Update typescript-eslint monorepo to v5.57.0 (#25046)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-06 10:13:16 +01:00
Weblate
79de2f6262 Merge branch 'origin/develop' into Weblate. 2023-04-06 09:11:49 +00:00
Christian Phyo
508d562040 Translated using Weblate (Burmese)
Currently translated at 3.3% (1 of 30 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/my/
2023-04-06 09:11:49 +00:00
renovate[bot]
12a380a08e
Update babel monorepo (#25042)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-06 10:11:43 +01:00
Christian Phyo
407891073d Added translation using Weblate (Burmese) 2023-04-06 04:02:19 +00:00
renovate[bot]
8df1d67a83
Update dependency concurrently to v8 (#25048)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-05 17:18:20 +01:00
RiotRobot
6d241c8ce0 v1.11.29-rc.1 2023-04-04 12:11:33 +01:00
RiotRobot
34662d13c8 Prepare changelog for v1.11.29-rc.1 2023-04-04 12:11:32 +01:00
RiotRobot
a79fba39de Upgrade matrix-react-sdk to 3.70.0-rc.1 2023-04-04 12:08:43 +01:00
RiotRobot
7b191b90df Upgrade matrix-js-sdk to 24.1.0-rc.1 2023-04-04 12:08:22 +01:00
Andy Balaam
472518fcc9
Merge pull request #25029 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2023-04-04 11:25:18 +01:00
Weblate
4cf671d005 Merge branch 'origin/develop' into Weblate. 2023-03-31 14:52:34 +00:00
Michael Telatynski
ddc2932541
Use frozen lockfile instead of pure lockfile on yarn install (#25009) 2023-03-31 14:52:29 +00:00
Weblate
ea6056fa59 Merge branch 'origin/develop' into Weblate. 2023-03-31 14:27:33 +00:00
RiotRobot
b3c88f7a16 Reset matrix-react-sdk back to develop branch 2023-03-31 15:27:26 +01:00
RiotRobot
95f166ad61 Reset matrix-js-sdk back to develop branch 2023-03-31 15:27:12 +01:00
Weblate
1a7c5a294b Merge branch 'origin/develop' into Weblate. 2023-03-31 14:27:02 +00:00
RiotRobot
569e5cb0c1 Merge branch 'master' into develop 2023-03-31 15:26:56 +01:00
RiotRobot
f2160391c2 v1.11.28 2023-03-31 15:23:07 +01:00
RiotRobot
62fa62dc3a Prepare changelog for v1.11.28 2023-03-31 15:23:06 +01:00
Weblate
e0aa7754b1 Merge branch 'origin/develop' into Weblate. 2023-03-31 10:41:23 +00:00
Janne Mareike Koschinski
89054a50ac
Replace newTranslatableError with UserFriendlyError (#25002)
* Apply user-friendly-error changes to element-web as well
* Update i18n library
2023-03-31 12:41:15 +02:00
Weblate
f833c57348 Merge branch 'origin/develop' into Weblate. 2023-03-31 09:50:07 +00:00
RiotRobot
1a63a7ff2e Reset matrix-react-sdk back to develop branch 2023-03-31 10:49:42 +01:00
RiotRobot
a66df9d434 Reset matrix-js-sdk back to develop branch 2023-03-31 10:49:21 +01:00
Weblate
c0cd678542 Merge branch 'origin/develop' into Weblate. 2023-03-31 09:48:45 +00:00