Commit Graph

12571 Commits (0a5173f258022d5b9ec5a4c288c71769b8d54624)

Author SHA1 Message Date
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
RiotRobot b9837cc771 Merge branch 'master' into develop 2023-03-31 10:48:17 +01:00
RiotRobot 9faa625551 v1.11.27 2023-03-31 10:27:10 +01:00
RiotRobot ebda5f4d31 Prepare changelog for v1.11.27 2023-03-31 10:27:09 +01:00
RiotRobot 145564719f Upgrade matrix-react-sdk to 3.69.1 2023-03-31 10:23:03 +01:00
Weblate 166d88058c Merge branch 'origin/develop' into Weblate. 2023-03-30 12:55:17 +00:00
Michael Telatynski 60d5ab427a
Fix concurrency conflict (#24989) 2023-03-30 13:55:09 +01:00
Weblate bcc5bd8e54 Merge branch 'origin/develop' into Weblate. 2023-03-30 11:28:27 +00:00
Richard van der Hoff b9b52c8c06
`code_style.md`: Add notes on comments (#24990) 2023-03-30 12:28:22 +01:00
Weblate 3210ff2e9c Merge branch 'origin/develop' into Weblate. 2023-03-29 14:32:10 +00:00
Andy Balaam 7cbd8e04c2
Update changelog for v1.11.26 now the security issue is public (#24975) 2023-03-29 15:32:02 +01:00
Weblate 86c2cb7649 Merge branch 'origin/develop' into Weblate. 2023-03-29 14:08:05 +00:00
Michael Telatynski 84242fc81f
Delete .sentryclirc (#24978) 2023-03-29 15:07:56 +01:00
Weblate 48e845575a Merge branch 'origin/develop' into Weblate. 2023-03-29 07:30:22 +00:00
Michael Telatynski 39061f9b8c
Update docker base images (#24966) 2023-03-29 08:30:16 +01:00
Weblate 41d025bf48 Merge branch 'origin/develop' into Weblate. 2023-03-28 13:48:14 +00:00
Weblate 581beee0b2 Merge branch 'origin/develop' into Weblate. 2023-03-28 13:47:22 +00:00
RiotRobot 9ec10a274e Reset matrix-react-sdk back to develop branch 2023-03-28 14:47:11 +01:00
RiotRobot c848295b8b Reset matrix-js-sdk back to develop branch 2023-03-28 14:46:52 +01:00
RiotRobot b472f34d63 Merge branch 'master' into develop 2023-03-28 14:45:38 +01:00