Commit Graph

13105 Commits

Author SHA1 Message Date
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
su-ex
5bcb0a17dd
Update version to 1.11.26-sc.1 2023-03-28 20:59:25 +02:00
su-ex
f8a3603940
Update version to 1.11.26-sc.0.test.0 2023-03-28 20:50:17 +02:00
su-ex
8020634e0d
Automatic package.json adjustment 2023-03-28 20:50:17 +02:00
su-ex
866f6d05af
Automatic i18n adjustment 2023-03-28 20:50:16 +02:00
su-ex
05f492be3f * Changes for matrix-js-sdk v24.0.0
* Changes for matrix-react-sdk v3.69.0
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEE6Vt2megLaKnq2aGaK6qbhVK9kEcFAmQi7yoRHHJlbGVhc2Vz
 QHJpb3QuaW0ACgkQK6qbhVK9kEctVw//YHiC9e/e/PVxxOUpHqpl+sUHa2zvzDvd
 G0AvQTe8DXoOJetfiLEQMlRM9DwuRPpfFDSb3HtJQ0ELEFoOxR+S8VPerOSe9psk
 FapmWzUEJdw2EjWAIGlTcvUgujVMuz1Di3SyhOOvrPeT7VFN5xJ/mjzYnlm2+TsM
 shEBuLXAUtqIvuOWdgusyXbWPqUUzd5xq4j5JXNSFaPUuEz9MyG+A24odhsRB0tR
 DVTsVfiQWJTGFmkLnGf/rvOMpAG/+IyFMJFTHf1mY4se6fcf5Qi0jdttP5OB6cYf
 b2F+xQ5u9WeWMeBrXq9GkknYixMnwjfpfmHHDO6JExP0wgAGC5MApPxvP7ZdTINv
 7pP5o9OZ0TNDtYK3P9eHnz9/b93NhTJ8CtimigPggNucTN/2VHM7szzx6EmHxhq6
 acD0XxsWncfs7gk2CTCZfBszwCT0MGY6U1pi0G7fDTwQYcwnuPZnRKTaNQiwhXQZ
 xDTM6BqL0wRrc6SAF+feq5LVm3qfznzKXPz3iibpdvElHJaOUW9DKvy5GML7RpXt
 3oijXZcAOarA/DJTo/5m15IUK/DRuUqHqCaSb1Geo4rcnj7zYIWPvpXrSoraoXyT
 v7Aee1pYgA75FMfQAsgamm+ZzxhcqHEZqti7yNy2+AgpKI+DjUuX3xsEKoK/je00
 k+qDPtH2DJo=
 =gz0n
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCAA3FiEEUMS2jJrglzPzHXqk10PFDIthmEwFAmQjNnoZHGNvZGV3b3Jr
 c0BzdXBlcmNhYmxlLm9ubAAKCRDXQ8UMi2GYTLcREAC8dklHgUlq650xDw0cWMuV
 +WDAPZ1jHgQhW3JWVL+j3TWeIeCdQwRBbID36eI3LMS67ICUxbKhqOmP6BX7pLft
 A6LXYwFFIQOpaZWNApQPaR2YuoXg3rdhDAs+i3pTk1q2jRPCVbcT4XZktdqlmsYh
 WN2mbgBEioYW4/q4dJXcPDDXQ9PX86V9w+Amv//GuikrhQ5rZseONUXeKYctxtkh
 Os64UOC3dhaPq3FfG5m1K+RfeTuFt0bLRQ3TLdxJP5U0PFA3jVYauOSIIJOYjtYA
 tyaKDrNJKB+JEVwikFlSRmVhuLYcfg5KqE07T3nabJHqBHXEUfBng4W9M2qUkW6T
 cj+UJ5u8wdgUJ1v2LMAlhzfdS+gwCACQ9zTld7DWYBElKPV3A6+HprLo1kcz/g+T
 zKanmbhEUYZdYmoSpI52ItDoN76PyEo+Ppc0vSyaZp5uG43gCWuSREO1+rsrzlSk
 pNNnjilSeXTUA+Djs6Z62PWkHFg5VsZ1ojEAYb+LZC16yfQgXMvHpShokYCs0nXk
 VHattNi7TiLw4O1IibmMrFAU9zIioaPrT7nVDpdo54M+MTh8xOkVZAMVwlTrPMZq
 7Qy8paPpV3l8iDGGSujg2MDxfskiTRIxpKzJerzuAYZok1wzQCldqK095pYiMZqE
 YMCsC46VyjgXaiG096DXPA==
 =fBG+
 -----END PGP SIGNATURE-----

Merge tag 'v1.11.26' into sc

* Changes for matrix-js-sdk v24.0.0
* Changes for matrix-react-sdk v3.69.0
2023-03-28 20:47:03 +02:00
su-ex
755b119b9e
Automatic package.json reversion 2023-03-28 20:47:01 +02:00
su-ex
bda5f4f128
Automatic i18n reversion 2023-03-28 20:47:01 +02: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
RiotRobot
7a002341f4 v1.11.26 2023-03-28 14:40:55 +01:00
RiotRobot
4969a80c06 Prepare changelog for v1.11.26 2023-03-28 14:40:54 +01:00
RiotRobot
21fa0887bd Upgrade matrix-react-sdk to 3.69.0 2023-03-28 14:37:43 +01:00
RiotRobot
11f56b06bf Upgrade matrix-js-sdk to 24.0.0 2023-03-28 14:37:24 +01:00
Weblate
dfaeb6368b Merge branch 'origin/develop' into Weblate. 2023-03-27 20:01:42 +00:00
Kerry
f033becebb
remove makeType utility from loading-test (#24958) 2023-03-28 09:01:33 +13:00
Weblate
f10171b6bc Merge branch 'origin/develop' into Weblate. 2023-03-22 16:49:51 +00:00
Johannes Marbach
dcc0cb74fe
Merge pull request #24895 from vector-im/Johennes-patch-1 2023-03-22 17:49:46 +01:00
Johannes Marbach
389f55c261
Update config.yml 2023-03-22 16:25:20 +01:00
Weblate
1716a7f9ca Merge branch 'origin/develop' into Weblate. 2023-03-22 14:05:16 +00:00
emrah
2575322360
Use a newly generated access_token while joining Jitsi (#24646)
Fixes: #24687
Signed-off-by: Emrah Eryilmaz emrah.com@gmail.com
2023-03-22 14:05:10 +00:00
Weblate
ab19f5654c Merge branch 'origin/develop' into Weblate. 2023-03-22 09:22:57 +00:00
Michael Telatynski
b9b0b096a4
Allow desktop app to expose recent rooms in UI integrations (#16940) 2023-03-22 09:22:51 +00:00
Weblate
b391109469 Merge branch 'origin/develop' into Weblate. 2023-03-21 10:25:35 +00:00
Robin
50f8be4a62
Update matrix-widget-api (#24872) 2023-03-21 10:25:26 +00:00
Weblate
d35f3df621 Merge branch 'origin/develop' into Weblate. 2023-03-20 08:21:23 +00:00
renovate[bot]
4121f72593
Update typescript-eslint monorepo to v5.55.0 (#24788)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-20 09:21:14 +01:00
Weblate
6a1a47aae1 Merge branch 'origin/develop' into Weblate. 2023-03-17 09:04:59 +00:00
Michael Telatynski
4440315cfb
Update apple-app-site-association (#24847) 2023-03-17 09:04:52 +00:00
Weblate
b2a7d65fc9 Merge branch 'origin/develop' into Weblate. 2023-03-16 11:32:46 +00:00
Germain
c8b3f5d512
Update safari support policy (#24842) 2023-03-16 11:32:39 +00:00