From a0ca53554f694ce2802375e90e0b67277adaec1a Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 27 Jun 2023 12:10:43 +0100 Subject: [PATCH 1/8] Upgrade matrix-react-sdk to 3.75.0-rc.1 --- package.json | 2 +- yarn.lock | 62 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index a7aec36a83..b257183907 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.75.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 0a9f8410c5..f7edad3e50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1591,6 +1591,11 @@ resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.10.tgz#b6a6395cffd3197ae2e0a88f4eeae8b315571fd2" integrity sha512-8V2NKuzGOFzEZeZVgF2is7gmuopdRbMZ064tzPDE0vN34iX6s3O8A4oxIT7SA3qtymwm3t1yEvTnT+0gfbmh4g== +"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.11": + version "0.1.0-alpha.11" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.11.tgz#24d705318c3159ef7dbe43bca464ac2bdd11e45d" + integrity sha512-HD3rskPkqrUUSaKzGLg97k/bN+OZrkcX7ODB/pNBs/jqq+/A0wDKqsszJotzFwsQcDPpWn78BmMyvBo4tLxKjw== + "@matrix-org/matrix-wysiwyg@^2.3.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-2.3.0.tgz#7a815fb90600342cc74c03a3cc7c9908a1d15dd1" @@ -4981,20 +4986,20 @@ emoji-regex@^9.2.2: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== -emojibase-data@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-7.0.1.tgz#a81d7fcd12247f7d94a96dcbdb143e6b6dd5c328" - integrity sha512-BLZpOdwyFpZ7lzBWyDtnxmKVm/SJMYgAfp1if3o6n1TVUMSXAf0nikONXl90LZuJ/m3XWPBkkubgCet2BsCGGQ== +emojibase-data@15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-15.0.0.tgz#d1f5467f3080688b9605103d0abdcd54bbc76419" + integrity sha512-hqrLNhEeBejKOQp5ArJcofkzV3qZBcp8czXj8nIKUGpBVc50NddNGwir4yAYxn3oNgrSj/lYdB9XxIVAKTkong== -emojibase-regex@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-6.0.1.tgz#dc0b33d05c02f045ea44795d453698b205d41f0f" - integrity sha512-Mj1UT6IIk4j91yMFE0QetpUYcmsr5ZDkkOIMSGafhIgC086mBMaCh2Keaykx8YEllmV7hmx5zdANDzCYBYAVDw== +emojibase-regex@15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-15.0.0.tgz#b4d1c6328500aaea4a794b11fe61f97df20af4ee" + integrity sha512-b5y58xrmZhH551zIa3ZOHl1mRI5KecA+5sAyWZCQEaj1maufZJJoENVwDqigzJoAkG604DuRqfdpy4E5rzSUsg== -emojibase@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-6.1.0.tgz#c3bc281e998a0e06398416090c23bac8c5ed3ee8" - integrity sha512-1GkKJPXP6tVkYJHOBSJHoGOr/6uaDxZ9xJ6H7m6PfdGXTmQgbALHLWaVRY4Gi/qf5x/gT/NUXLPuSHYLqtLtrQ== +emojibase@15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/emojibase/-/emojibase-15.0.0.tgz#f41b7773ec9a8a332373c18628ff4471255bd769" + integrity sha512-bvSIs98sHaVnyKPmW+obRjo49MFx0g+rhfSz6mTePAagEZSlDPosq0b6AcSJa5gt48z3VP2ooXclyBs8vIkpGA== emojis-list@^3.0.0: version "3.0.0" @@ -8354,6 +8359,24 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@26.2.0-rc.1: + version "26.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.2.0-rc.1.tgz#95e7f0edcae190f9f987689bccf2f9907e9b6038" + integrity sha512-3HSrgazVlh1chtM+sUdl5hOvNE3OQhnYnyTcT1duwIFYV0duiDPVt1lRX+pFkYq0Hq06Fdtaw25/PbO5Gzkj0Q== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.11" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.3.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "26.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b77fe465f75fc0c273e22d6ff8bde658f35a68b6" @@ -8378,9 +8401,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.74.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f81115e57e097e305a9a03b4192d1c732e4e7cb4" +matrix-react-sdk@3.75.0-rc.1: + version "3.75.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.75.0-rc.1.tgz#cc4ea066ea39196dc65b2a8aa0b1c2182500e8ce" + integrity sha512-nCqjtj0P51skGyif9gTcCzcV/B6QiI50IKeSqk/dynj+6GLf0nbWuW1CFH3n7cOQ30U0DiBU8Rv80ls2lMdykw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8397,9 +8421,9 @@ matrix-mock-request@^2.5.0: counterpart "^0.18.6" diff-dom "^4.2.2" diff-match-patch "^1.0.5" - emojibase "6.1.0" - emojibase-data "7.0.1" - emojibase-regex "6.0.1" + emojibase "15.0.0" + emojibase-data "15.0.0" + emojibase-regex "15.0.0" escape-html "^1.0.3" file-saver "^2.0.5" filesize "10.0.7" @@ -8420,7 +8444,7 @@ matrix-mock-request@^2.5.0: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "26.2.0-rc.1" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" From 9c8027d03c1902fb037098c3613c0503f0fc36e3 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 27 Jun 2023 12:11:19 +0100 Subject: [PATCH 2/8] Upgrade matrix-js-sdk to 26.2.0-rc.1 --- package.json | 2 +- yarn.lock | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/package.json b/package.json index b257183907..9aa685448b 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "26.2.0-rc.1", "matrix-react-sdk": "3.75.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index f7edad3e50..9cc78cc125 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1586,11 +1586,6 @@ resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.5.0.tgz#38b69c4e29d243944c5712cca7b674a3432056e6" integrity sha512-uL5kf7MqC+GxsGJtimPVbFliyaFinohTHSzohz31JTysktHsjRR2SC+vV7sy2/dstTWVdG9EGOnohyPsB+oi3A== -"@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.10": - version "0.1.0-alpha.10" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.10.tgz#b6a6395cffd3197ae2e0a88f4eeae8b315571fd2" - integrity sha512-8V2NKuzGOFzEZeZVgF2is7gmuopdRbMZ064tzPDE0vN34iX6s3O8A4oxIT7SA3qtymwm3t1yEvTnT+0gfbmh4g== - "@matrix-org/matrix-sdk-crypto-js@^0.1.0-alpha.11": version "0.1.0-alpha.11" resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.0-alpha.11.tgz#24d705318c3159ef7dbe43bca464ac2bdd11e45d" @@ -8377,23 +8372,6 @@ matrix-js-sdk@26.2.0-rc.1: unhomoglyph "^1.0.6" uuid "9" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "26.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b77fe465f75fc0c273e22d6ff8bde658f35a68b6" - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.10" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.3.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" From b64cf2e51c06e73680dd7b9cec983f966e07f206 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 27 Jun 2023 12:12:53 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.11.35-rc.1 --- CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8a2ddee9d..81edcc24ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,42 @@ +Changes in [1.11.35-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.35-rc.1) (2023-06-27) +=========================================================================================================== + +## 🦖 Deprecations + * Remove `feature_favourite_messages` as it is has been abandoned for now ([\#11097](https://github.com/matrix-org/matrix-react-sdk/pull/11097)). Fixes #25555. + +## ✨ Features + * Don't setup keys on login when encryption is force disabled ([\#11125](https://github.com/matrix-org/matrix-react-sdk/pull/11125)). Contributed by @kerryarchibald. + * OIDC: attempt dynamic client registration ([\#11074](https://github.com/matrix-org/matrix-react-sdk/pull/11074)). Fixes #25468 and #25467. Contributed by @kerryarchibald. + * OIDC: Check static client registration and add login flow ([\#11088](https://github.com/matrix-org/matrix-react-sdk/pull/11088)). Fixes #25467. Contributed by @kerryarchibald. + * Improve message body output from plain text editor ([\#11124](https://github.com/matrix-org/matrix-react-sdk/pull/11124)). Contributed by @alunturner. + * Disable encryption toggle in room settings when force disabled ([\#11122](https://github.com/matrix-org/matrix-react-sdk/pull/11122)). Contributed by @kerryarchibald. + * Add .well-known config option to force disable encryption on room creation ([\#11120](https://github.com/matrix-org/matrix-react-sdk/pull/11120)). Contributed by @kerryarchibald. + * Handle permalinks in room topic ([\#11115](https://github.com/matrix-org/matrix-react-sdk/pull/11115)). Fixes #23395. + * Add at room avatar for RTE ([\#11106](https://github.com/matrix-org/matrix-react-sdk/pull/11106)). Contributed by @alunturner. + * Remove new room breadcrumbs ([\#11104](https://github.com/matrix-org/matrix-react-sdk/pull/11104)). + * Update rich text editor dependency and associated changes ([\#11098](https://github.com/matrix-org/matrix-react-sdk/pull/11098)). Contributed by @alunturner. + * Implement new model, hooks and reconcilation code for new GYU notification settings ([\#11089](https://github.com/matrix-org/matrix-react-sdk/pull/11089)). Contributed by @justjanne. + * Allow maintaining a different right panel width for thread panels ([\#11064](https://github.com/matrix-org/matrix-react-sdk/pull/11064)). Fixes #25487. + * Make AppPermission pane scrollable ([\#10954](https://github.com/matrix-org/matrix-react-sdk/pull/10954)). Fixes #25438 and #25511. Contributed by @luixxiul. + * Integrate compound design tokens ([\#11091](https://github.com/matrix-org/matrix-react-sdk/pull/11091)). Fixes vector-im/internal-planning#450. + * Don't warn about the effects of redacting state events when redacting non-state-events ([\#11071](https://github.com/matrix-org/matrix-react-sdk/pull/11071)). Fixes #8478. + * Allow specifying help URLs in config.json ([\#11070](https://github.com/matrix-org/matrix-react-sdk/pull/11070)). Fixes #15268. + +## 🐛 Bug Fixes + * Fix error when generating error for polling for updates ([\#25609](https://github.com/vector-im/element-web/pull/25609)). + * Fix spurious notifications on non-live events ([\#11133](https://github.com/matrix-org/matrix-react-sdk/pull/11133)). Fixes #24336. + * Prevent auto-translation within composer ([\#11114](https://github.com/matrix-org/matrix-react-sdk/pull/11114)). Fixes #25624. + * Fix caret jump when backspacing into empty line at beginning of editor ([\#11128](https://github.com/matrix-org/matrix-react-sdk/pull/11128)). Fixes #22335. + * Fix server picker not allowing you to switch from custom to default ([\#11127](https://github.com/matrix-org/matrix-react-sdk/pull/11127)). Fixes #25650. + * Consider the unthreaded read receipt for Unread dot state ([\#11117](https://github.com/matrix-org/matrix-react-sdk/pull/11117)). Fixes #24229. + * Increase RTE resilience ([\#11111](https://github.com/matrix-org/matrix-react-sdk/pull/11111)). Fixes #25277. Contributed by @alunturner. + * Fix RoomView ignoring alias lookup errors due to them not knowing the roomId ([\#11099](https://github.com/matrix-org/matrix-react-sdk/pull/11099)). Fixes #24783 and #25562. + * Fix style inconsistencies on SecureBackupPanel ([\#11102](https://github.com/matrix-org/matrix-react-sdk/pull/11102)). Fixes #25615. Contributed by @luixxiul. + * Remove unknown MXIDs from invite suggestions ([\#11055](https://github.com/matrix-org/matrix-react-sdk/pull/11055)). Fixes #25446. + * Reduce volume of ring sounds to normalised levels ([\#9143](https://github.com/matrix-org/matrix-react-sdk/pull/9143)). Contributed by @JMoVS. + * Fix slash commands not being enabled in certain cases ([\#11090](https://github.com/matrix-org/matrix-react-sdk/pull/11090)). Fixes #25572. + * Prevent escape in threads from sending focus to main timeline composer ([\#11061](https://github.com/matrix-org/matrix-react-sdk/pull/11061)). Fixes #23397. + Changes in [1.11.34](https://github.com/vector-im/element-web/releases/tag/v1.11.34) (2023-06-20) ================================================================================================= From 30bff44cf9ace6436408dba59782d149c4dcbf27 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 27 Jun 2023 12:12:54 +0100 Subject: [PATCH 4/8] v1.11.35-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9aa685448b..08f77f23c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.34", + "version": "1.11.35-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 53ac1d180800dc6fcf00ab947959a39a367e2ee9 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 4 Jul 2023 15:21:06 +0100 Subject: [PATCH 5/8] Upgrade matrix-react-sdk to 3.75.0 --- package.json | 2 +- yarn.lock | 28 +++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 08f77f23c5..ce502298fb 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "26.2.0-rc.1", - "matrix-react-sdk": "3.75.0-rc.1", + "matrix-react-sdk": "3.75.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 9cc78cc125..44929fed03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8354,6 +8354,24 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== +matrix-js-sdk@26.2.0: + version "26.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.2.0.tgz#0b7dfbb2d1ca1fb699f627d85c7ed10137947c33" + integrity sha512-Om6p8iC/2ojw0MQBmz/DYqbz3sFSJF2jE92sZcpLA/cki1SaXLpD2V5N9RcZgcHGmtm3w49822sIs8nWVyBAFQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.11" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.3.1" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + matrix-js-sdk@26.2.0-rc.1: version "26.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.2.0-rc.1.tgz#95e7f0edcae190f9f987689bccf2f9907e9b6038" @@ -8379,10 +8397,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.75.0-rc.1: - version "3.75.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.75.0-rc.1.tgz#cc4ea066ea39196dc65b2a8aa0b1c2182500e8ce" - integrity sha512-nCqjtj0P51skGyif9gTcCzcV/B6QiI50IKeSqk/dynj+6GLf0nbWuW1CFH3n7cOQ30U0DiBU8Rv80ls2lMdykw== +matrix-react-sdk@3.75.0: + version "3.75.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.75.0.tgz#677646d9fc1fc6a617f579e8d4bc4bbbccafdf74" + integrity sha512-iniSUalf1Be4r8lr1+kdDfFllQxMTbtrfBLmZxA0aGtBTavGceQFp+wiLwzYYykdRPNVC4U7ojmt3lxWD/3aXQ== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.5.0" @@ -8422,7 +8440,7 @@ matrix-react-sdk@3.75.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "26.2.0-rc.1" + matrix-js-sdk "26.2.0" matrix-widget-api "^1.4.0" memoize-one "^6.0.0" minimist "^1.2.5" From eec95438ded3ef09d1b6c0c22c57a0e3188b54b2 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 4 Jul 2023 15:22:26 +0100 Subject: [PATCH 6/8] Upgrade matrix-js-sdk to 26.2.0 --- package.json | 2 +- yarn.lock | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/package.json b/package.json index ce502298fb..33d8aebb0c 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "26.2.0-rc.1", + "matrix-js-sdk": "26.2.0", "matrix-react-sdk": "3.75.0", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 44929fed03..afd53908a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8372,24 +8372,6 @@ matrix-js-sdk@26.2.0: unhomoglyph "^1.0.6" uuid "9" -matrix-js-sdk@26.2.0-rc.1: - version "26.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-26.2.0-rc.1.tgz#95e7f0edcae190f9f987689bccf2f9907e9b6038" - integrity sha512-3HSrgazVlh1chtM+sUdl5hOvNE3OQhnYnyTcT1duwIFYV0duiDPVt1lRX+pFkYq0Hq06Fdtaw25/PbO5Gzkj0Q== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.11" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.3.1" - p-retry "4" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - uuid "9" - matrix-mock-request@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.6.0.tgz#0855c10b250668ce542b697251087be2bcc23f92" From aa55a2ffa025c73d063aa87d3a2f1afbbbf37afd Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 4 Jul 2023 15:23:53 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.11.35 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81edcc24ff..3b6de32880 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Changes in [1.11.35-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.35-rc.1) (2023-06-27) -=========================================================================================================== +Changes in [1.11.35](https://github.com/vector-im/element-web/releases/tag/v1.11.35) (2023-07-04) +================================================================================================= ## 🦖 Deprecations * Remove `feature_favourite_messages` as it is has been abandoned for now ([\#11097](https://github.com/matrix-org/matrix-react-sdk/pull/11097)). Fixes #25555. From c28661795970e510b3940444f4d1feaf66805b18 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Tue, 4 Jul 2023 15:23:54 +0100 Subject: [PATCH 8/8] v1.11.35 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 33d8aebb0c..ba3a7e1a2d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.35-rc.1", + "version": "1.11.35", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {