Commit Graph

13227 Commits

Author SHA1 Message Date
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
su-ex
a46cb302c7
Update version to 1.11.28-sc.0.test.1 2023-04-02 02:30:27 +02:00
su-ex
20d987d3da
Update version to 1.11.28-sc.0.test.0 2023-04-01 12:58:05 +02:00
su-ex
255c4789ac
Automatic package.json adjustment 2023-04-01 12:58:04 +02:00
su-ex
ee90bae2e4
Automatic i18n adjustment 2023-04-01 12:58:04 +02:00
su-ex
8685ee7770 * (No changes, version bumped to sync with element-desktop.)
-----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEE6Vt2megLaKnq2aGaK6qbhVK9kEcFAmQm7ZQRHHJlbGVhc2Vz
 QHJpb3QuaW0ACgkQK6qbhVK9kEfphxAAiBa+AKLcw284P/r2MZrly67IIVPGxJ6s
 p5V0kakmIoHF0zMueOKeNVNoMHwJZpL9/XcuD6LtFNhGIO9XRJoVVyFxzRIYaTfm
 1wh/kfULLAwVER7UUb5w8GPqeU5huPXT31S64ja7KOUeX6VaIGvb3Z6SnIwrMRfc
 eorGYE1yiKfavBoXlmdsYFVaNyXgCLh2DtQfq+Iyv81tJvRfdoPXCqH6XJl2sPiv
 BDG3wTA/dMY4IE5o7LdTiS0ChC/LiMVs0A/hZWsLYrSkR2jXgc4jfCfdJtjDjmJL
 vZTNxXoru2PhkgeY7nV/MV4LFsybJ1Y9YWTbN4IhQ2cUExgotIFvxiF5oHkpnjyW
 uZE88lv12IxbS9uzueQCI35IBp3cCnlbC9+Q2aw+Dzztper50Eibx0TI4V5mrNt/
 Xo/iYZA/SXGLFEQTpnhjimpluTxmULar9M6m8jRGZE4QGAznoNOMbc731k3Bgtse
 iaXYGDnJ/qo74BM7sOT2SsD8Rg5zDK0Lt4SBl57Kw+TEGq/rjPSbO7Pxx26PVVr2
 evd5zPc0Hqaqxg31Y7uJDMp6NdjJI/OQRFyy+opomSI1+FUO/h53CFlytIHG+vPP
 Jn2h/a7M40iq1RuKKxdr5EFfpzPVq3Ql6CiNoy2cSbg47382RmJY23dHKckqFOKn
 An2DZHk8m3Y=
 =y3CN
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCAA3FiEEUMS2jJrglzPzHXqk10PFDIthmEwFAmQoDbIZHGNvZGV3b3Jr
 c0BzdXBlcmNhYmxlLm9ubAAKCRDXQ8UMi2GYTB7pEAC8l30d0U4aBr9bjZcbKE27
 3YigqdX5qdG6513yw3BwO0esKgdjBoUUqU6kTcBop+lREhL2uKtlGse6Ru/fQyYU
 cM2DD4LrR4nnDTO7sMg+sqnR7S/atUzj3Gclsk/ikhzwvwSE3g1dKCoOFJGbF2wR
 fD6TUUF6WA6fEHstFY0cIJVaVm8lw29HjquTzEOIW1QabmfWK7rHtkrzK5HIjafW
 rXVrv5yBMlQ/l42vj0MH+/APg85F5s0OAg02qkQIDCGjoLtCdXx9jf30yTCBklIN
 Co9tuJmeq3TC5pbPUeHTH7kSksGDzy6KGnh1pc6bcnHpFvxRcFsrJ5YLxk3MesW4
 RAZwXn+6EpbRdvgIZQy3GMa72wqqKMPNHHGpIspYdTBDe8eGYuFT3T1oxs+AIpPX
 Sn8tXks4+7HnicLOBWwg4C+ds1q8uAJnPAo0HYN/gWeZYmZgXMxDakSC5WwN+rHd
 0/T0l7UA6E4cKM+0vulTxDR+EDqFgaPjqBeMI2wXj9X7KYPHsxj924lHW8aK6pvQ
 JNCY1dtyKnIL6FSvU6y6XnKCe9+9SK/8sPiSZ2Yit/oqzemUgJQQVtVNj9Dxo9i7
 Rh76AQA+jilh3qMADU1jz1DS4GKK2GndgFbsm2eO04u0ZZawif1YvIx6oGlxk38w
 zt7NZsKj+5XURYMUb+nu+g==
 =+skW
 -----END PGP SIGNATURE-----

Merge tag 'v1.11.28' into sc

* (No changes, version bumped to sync with element-desktop.)
2023-04-01 12:55:43 +02:00
su-ex
3aa2911321
Automatic package.json reversion 2023-04-01 12:55:41 +02:00
su-ex
0e19898b51
Automatic i18n reversion 2023-04-01 12:55:41 +02: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
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