From baacd4ca8c567edabc17c28b72c6e3b37bb36f3d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Sep 2023 12:49:19 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 28.2.0-rc.1 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6dc8296e4f..fd7aea5645 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "28.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 3fab657faf..c15b45d8a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8886,6 +8886,26 @@ 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@28.2.0-rc.1: + version "28.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.2.0-rc.1.tgz#42613538b1cc73d1f03406c781a702a6a40fd1cf" + integrity sha512-B0w7FDd05MhTkKEAklrRm4D63Rn9gLnj23RTSHenOSxZ9j4a8loQ0MoZzPIx+KQJ/FFKZ9ZfQeGJZZ03npMAmQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^3.1.2" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^2.2.4" + 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 "28.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/40168d441983c72988c94ba7df5d54afdeddc0cb" From 0285eab20c2a39d651f82ee2118d961fdbeb5357 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Sep 2023 12:49:42 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.81.0-rc.1 --- package.json | 2 +- yarn.lock | 28 +++++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index fd7aea5645..b30936dc86 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "28.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.81.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 c15b45d8a3..287d6d8e7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8906,25 +8906,6 @@ matrix-js-sdk@28.2.0-rc.1: unhomoglyph "^1.0.6" uuid "9" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "28.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/40168d441983c72988c94ba7df5d54afdeddc0cb" - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^3.1.2" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^2.2.4" - 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" @@ -8932,9 +8913,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.80.1" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/dce42d32e755fe13cafd2bed8a06831b7412e44d" +matrix-react-sdk@3.81.0-rc.1: + version "3.81.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.81.0-rc.1.tgz#fc6f4fadaa2ebb5551cd701677f1e7b138b06570" + integrity sha512-nJWJqUXZTOR9BOqcvgGZb6hmNcRze0V+gYt9qwFcyYqtEOUycZcdR3xnUWCwf27AJhCPptocu91tPwHJKl+elA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.7.0" @@ -8975,7 +8957,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 "28.2.0-rc.1" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From e288bf6ae3d0dfb14ddd9cecca7ca00c6cc62b3f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Sep 2023 12:51:48 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.11.44-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6894e290f1..56fa2e272d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.11.44-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.44-rc.1) (2023-09-19) +=========================================================================================================== + +## ✨ Features + * Make video & voice call buttons pin conference widget if unpinned ([\#11576](https://github.com/matrix-org/matrix-react-sdk/pull/11576)). Fixes vector-im/customer-retainer#72. + * OIDC: persist refresh token ([\#11249](https://github.com/matrix-org/matrix-react-sdk/pull/11249)). Contributed by @kerryarchibald. + * ElementR: Cross user verification ([\#11364](https://github.com/matrix-org/matrix-react-sdk/pull/11364)). Fixes #25752. Contributed by @florianduros. + * Default intentional mentions ([\#11602](https://github.com/matrix-org/matrix-react-sdk/pull/11602)). + * Notify users about denied access on ask-to-join rooms ([\#11480](https://github.com/matrix-org/matrix-react-sdk/pull/11480)). Contributed by @nurjinjafar. + * Allow setting knock room directory visibility ([\#11529](https://github.com/matrix-org/matrix-react-sdk/pull/11529)). Contributed by @charlynguyen. + +## 🐛 Bug Fixes + * Escape placeholder before injecting it into the style ([\#11607](https://github.com/matrix-org/matrix-react-sdk/pull/11607)). + * Move ViewUser action callback to RoomView ([\#11495](https://github.com/matrix-org/matrix-react-sdk/pull/11495)). Fixes #26040. + * Fix room timeline search toggling behaviour edge case ([\#11605](https://github.com/matrix-org/matrix-react-sdk/pull/11605)). Fixes #26105. + * Avoid rendering view-message link in RoomKnocksBar unnecessarily ([\#11598](https://github.com/matrix-org/matrix-react-sdk/pull/11598)). Contributed by @charlynguyen. + * Use knock rooms sync to reflect the knock state ([\#11596](https://github.com/matrix-org/matrix-react-sdk/pull/11596)). Fixes #26043 and #26044. Contributed by @charlynguyen. + * Fix avatar in right panel not using the correct font ([\#11593](https://github.com/matrix-org/matrix-react-sdk/pull/11593)). Fixes #26061. Contributed by @MidhunSureshR. + * Add waits in Spotlight Cypress tests, hoping this unflakes them ([\#11590](https://github.com/matrix-org/matrix-react-sdk/pull/11590)). Fixes #26053, #26140 #26139 and #26138. Contributed by @andybalaam. + * Fix vertical alignment of default avatar font ([\#11582](https://github.com/matrix-org/matrix-react-sdk/pull/11582)). Fixes #26081. + * Fix avatars in public room & space search being flex shrunk ([\#11580](https://github.com/matrix-org/matrix-react-sdk/pull/11580)). Fixes #26133. + * Fix EventTile avatars being rendered with a size of 0 instead of hidden ([\#11558](https://github.com/matrix-org/matrix-react-sdk/pull/11558)). Fixes #26075. + Changes in [1.11.43](https://github.com/vector-im/element-web/releases/tag/v1.11.43) (2023-09-15) ================================================================================================= From ce616caf9935c43cdb641c1fd116a1db6b2b1995 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 Sep 2023 12:51:48 +0100 Subject: [PATCH 4/8] v1.11.44-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b30936dc86..a8f8762a3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.43", + "version": "1.11.44-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 9ac837068f4aff47d5fd0a1897987c115d20a907 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Sep 2023 13:26:28 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 28.2.0 --- package.json | 2 +- yarn.lock | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a8f8762a3f..2daf78bf3a 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "lodash": "^4.17.21", - "matrix-js-sdk": "28.2.0-rc.1", + "matrix-js-sdk": "28.2.0", "matrix-react-sdk": "3.81.0-rc.1", "matrix-widget-api": "^1.3.1", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 287d6d8e7b..68190d541b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8886,6 +8886,26 @@ 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@28.2.0: + version "28.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.2.0.tgz#2ec2d15c8f1e0dff85e7ec9e9ad061b039320def" + integrity sha512-YENmPaiGgWwCqoYWoL/8oD7QPWd6M/A0xdNhC4yMSiFny419AjUdPQk/EbM8RTSzQV27F79llhWisnz+/AXdaA== + dependencies: + "@babel/runtime" "^7.12.5" + "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0" + another-json "^0.2.0" + bs58 "^5.0.0" + content-type "^1.0.4" + jwt-decode "^3.1.2" + loglevel "^1.7.1" + matrix-events-sdk "0.0.1" + matrix-widget-api "^1.6.0" + oidc-client-ts "^2.2.4" + p-retry "4" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + uuid "9" + matrix-js-sdk@28.2.0-rc.1: version "28.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.2.0-rc.1.tgz#42613538b1cc73d1f03406c781a702a6a40fd1cf" From 09291a9cf5b45cf8e3ed0fee06f4630e677fece4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Sep 2023 13:32:57 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.81.0 --- package.json | 2 +- yarn.lock | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 2daf78bf3a..0be68f206f 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "katex": "^0.16.0", "lodash": "^4.17.21", "matrix-js-sdk": "28.2.0", - "matrix-react-sdk": "3.81.0-rc.1", + "matrix-react-sdk": "3.81.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 68190d541b..9f3e71b8fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8906,26 +8906,6 @@ matrix-js-sdk@28.2.0: unhomoglyph "^1.0.6" uuid "9" -matrix-js-sdk@28.2.0-rc.1: - version "28.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.2.0-rc.1.tgz#42613538b1cc73d1f03406c781a702a6a40fd1cf" - integrity sha512-B0w7FDd05MhTkKEAklrRm4D63Rn9gLnj23RTSHenOSxZ9j4a8loQ0MoZzPIx+KQJ/FFKZ9ZfQeGJZZ03npMAmQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@matrix-org/matrix-sdk-crypto-wasm" "^1.2.3-alpha.0" - another-json "^0.2.0" - bs58 "^5.0.0" - content-type "^1.0.4" - jwt-decode "^3.1.2" - loglevel "^1.7.1" - matrix-events-sdk "0.0.1" - matrix-widget-api "^1.6.0" - oidc-client-ts "^2.2.4" - 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" @@ -8933,10 +8913,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.81.0-rc.1: - version "3.81.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.81.0-rc.1.tgz#fc6f4fadaa2ebb5551cd701677f1e7b138b06570" - integrity sha512-nJWJqUXZTOR9BOqcvgGZb6hmNcRze0V+gYt9qwFcyYqtEOUycZcdR3xnUWCwf27AJhCPptocu91tPwHJKl+elA== +matrix-react-sdk@3.81.0: + version "3.81.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.81.0.tgz#3c07b431151243cfe6edb93b802666b94c7a3e6d" + integrity sha512-TKlKBdvSEtPcWgNsDPy5bye23OYUSrSi7Q4d3VFPqitoOvR3WIE3pNKLpRDwoakDVanUCLc4wHUCN9L9VyMvNA== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.7.0" @@ -8977,7 +8957,7 @@ matrix-react-sdk@3.81.0-rc.1: maplibre-gl "^2.0.0" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "28.2.0-rc.1" + matrix-js-sdk "28.2.0" matrix-widget-api "^1.5.0" memoize-one "^6.0.0" minimist "^1.2.5" From d6cf0c7be2265aa30e29c0ef44e45781f010c573 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Sep 2023 14:05:16 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.11.44 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56fa2e272d..b776a5ffcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Changes in [1.11.44-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.44-rc.1) (2023-09-19) -=========================================================================================================== +Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26) +================================================================================================= ## ✨ Features * Make video & voice call buttons pin conference widget if unpinned ([\#11576](https://github.com/matrix-org/matrix-react-sdk/pull/11576)). Fixes vector-im/customer-retainer#72. @@ -10,6 +10,7 @@ Changes in [1.11.44-rc.1](https://github.com/vector-im/element-web/releases/tag/ * Allow setting knock room directory visibility ([\#11529](https://github.com/matrix-org/matrix-react-sdk/pull/11529)). Contributed by @charlynguyen. ## 🐛 Bug Fixes + * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](https://github.com/matrix-org/matrix-react-sdk/pull/11634)). Fixes #26209. * Escape placeholder before injecting it into the style ([\#11607](https://github.com/matrix-org/matrix-react-sdk/pull/11607)). * Move ViewUser action callback to RoomView ([\#11495](https://github.com/matrix-org/matrix-react-sdk/pull/11495)). Fixes #26040. * Fix room timeline search toggling behaviour edge case ([\#11605](https://github.com/matrix-org/matrix-react-sdk/pull/11605)). Fixes #26105. From e0dc62f7b147e354e11cca37a1e37a061228d2a2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 26 Sep 2023 14:05:16 +0100 Subject: [PATCH 8/8] v1.11.44 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0be68f206f..620ac39141 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.44-rc.1", + "version": "1.11.44", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {