From fe78b1678982b6a7d75c9d5dc38368de83c8e0c1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Nov 2022 18:07:51 +0000 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 21.2.0-rc.1 --- package.json | 2 +- yarn.lock | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9aeeba035..1d4af70eb 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,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": "21.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.1.1", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index ce27bc532..1aaae9260 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8265,6 +8265,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@21.2.0-rc.1: + version "21.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.2.0-rc.1.tgz#8fe43ab89962d62ae7a35eba3d5689bad8b60fce" + integrity sha512-PQfTY1FC8pa8FtkrSJdLQ1yTWLZ+ZeAavhk+S8Og5MKc8g618zJelOVA/7XQJgCdGNEOb29L9yKSfsl1qHFrtQ== + dependencies: + "@babel/runtime" "^7.12.5" + "@types/sdp-transform" "^2.4.5" + 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.0.0" + p-retry "4" + qs "^6.9.6" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "21.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6ee258789c9e01d328b5d9158b5b372e3a0da82" @@ -8330,7 +8348,7 @@ matrix-mock-request@^2.5.0: lodash "^4.17.20" maplibre-gl "^1.15.2" matrix-encrypt-attachment "^1.0.3" - matrix-events-sdk "0.0.1" + matrix-events-sdk "^0.0.1-beta.7" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-widget-api "^1.1.1" minimist "^1.2.5" From 78bf0f6898de5c662a3e3f05cdc5a3313bafc137 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Nov 2022 18:09:12 +0000 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.61.0-rc.1 --- package.json | 2 +- yarn.lock | 38 +++++++++++--------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 1d4af70eb..7b296c0ee 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "21.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.61.0-rc.1", "matrix-widget-api": "^1.1.1", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 1aaae9260..4c7dd4f59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1573,10 +1573,10 @@ resolved "https://registry.yarnpkg.com/@matrix-org/analytics-events/-/analytics-events-0.3.0.tgz#a428f7e3f164ffadf38f35bc0f0f9a3e47369ce6" integrity sha512-f1WIMA8tjNB3V5g1C34yIpIJK47z6IJ4SLiY4j+J9Gw4X8C3TKGTAx563rMcMvW3Uk/PFqnIBXtkavHBXoYJ9A== -"@matrix-org/matrix-wysiwyg@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.3.2.tgz#586f3ad2f4a7bf39d8e2063630c52294c877bcd6" - integrity sha512-Q6Ntj2q1/7rVUlro94snn9eZy/3EbrGqaq5nqNMbttXcnFzYtgligDV1avViB4Um6ZRdDOxnQEPkMca/SqYSmw== +"@matrix-org/matrix-wysiwyg@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@matrix-org/matrix-wysiwyg/-/matrix-wysiwyg-0.6.0.tgz#f06577eec5a98fa414d2cd66688d32d984544c94" + integrity sha512-6wq6RzpGZLxAcczHL7+QuGLJwGcvUSAm1zXd/0FzevfIKORbGKF2uCWgQ4JoZVpe4rbBNJgtPGb1r36W/i66/A== "@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz": version "3.2.12" @@ -8283,23 +8283,6 @@ matrix-js-sdk@21.2.0-rc.1: sdp-transform "^2.14.1" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "21.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c6ee258789c9e01d328b5d9158b5b372e3a0da82" - dependencies: - "@babel/runtime" "^7.12.5" - "@types/sdp-transform" "^2.4.5" - 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.0.0" - p-retry "4" - qs "^6.9.6" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - matrix-mock-request@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.5.0.tgz#78da2590e82be2e31edcf9814833af5e5f8d2f1a" @@ -8307,13 +8290,14 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.60.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/50b72307691224649cc4424d44e320c16a6da439" +matrix-react-sdk@3.61.0-rc.1: + version "3.61.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.61.0-rc.1.tgz#dd9f75fad3693c74eff1be0236fa32c692de7af6" + integrity sha512-fcPOcHtRSp0bWjY2sPgDttG4oO/4KDX8GALZHtZqMjoyiXly56aY7ubxq3Y1x/O7FgU/RNN8P3fSqkZzo+y2fw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.3.0" - "@matrix-org/matrix-wysiwyg" "^0.3.2" + "@matrix-org/matrix-wysiwyg" "^0.6.0" "@matrix-org/react-sdk-module-api" "^0.0.3" "@sentry/browser" "^6.11.0" "@sentry/tracing" "^6.11.0" @@ -8348,8 +8332,8 @@ matrix-mock-request@^2.5.0: lodash "^4.17.20" maplibre-gl "^1.15.2" matrix-encrypt-attachment "^1.0.3" - matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-events-sdk "0.0.1" + matrix-js-sdk "21.2.0-rc.1" matrix-widget-api "^1.1.1" minimist "^1.2.5" opus-recorder "^8.0.3" From c92961097f3cbbd052507d6a59004dfb813bb0ac Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Nov 2022 18:12:11 +0000 Subject: [PATCH 3/8] Prepare changelog for v1.11.15-rc.1 --- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d583ae680..0dc9a9b72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,33 @@ +Changes in [1.11.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.15-rc.1) (2022-11-15) +=========================================================================================================== + +## ✨ Features + * Make clear notifications work with threads ([\#9575](https://github.com/matrix-org/matrix-react-sdk/pull/9575)). Fixes #23751. + * Change "None" to "Off" in notification options ([\#9539](https://github.com/matrix-org/matrix-react-sdk/pull/9539)). Contributed by @Arnei. + * Advanced audio processing settings ([\#8759](https://github.com/matrix-org/matrix-react-sdk/pull/8759)). Fixes #6278. Contributed by @MrAnno. + * Add way to create a user notice via config.json ([\#9559](https://github.com/matrix-org/matrix-react-sdk/pull/9559)). + * Improve design of the rich text editor ([\#9533](https://github.com/matrix-org/matrix-react-sdk/pull/9533)). Contributed by @florianduros. + * Enable user to zoom beyond image size ([\#5949](https://github.com/matrix-org/matrix-react-sdk/pull/5949)). Contributed by @jaiwanth-v. + * Fix: Move "Leave Space" option to the bottom of space context menu ([\#9535](https://github.com/matrix-org/matrix-react-sdk/pull/9535)). Contributed by @hanadi92. + +## 🐛 Bug Fixes + * Make build scripts work on NixOS ([\#23740](https://github.com/vector-im/element-web/pull/23740)). + * Fix integration manager `get_open_id_token` action and add E2E tests ([\#9520](https://github.com/matrix-org/matrix-react-sdk/pull/9520)). + * Fix links being mangled by markdown processing ([\#9570](https://github.com/matrix-org/matrix-react-sdk/pull/9570)). Fixes #23743. + * Fix: inline links selecting radio button ([\#9543](https://github.com/matrix-org/matrix-react-sdk/pull/9543)). Contributed by @hanadi92. + * Fix wrong error message in registration when phone number threepid is in use. ([\#9571](https://github.com/matrix-org/matrix-react-sdk/pull/9571)). Contributed by @bagvand. + * Fix missing avatar for show current profiles ([\#9563](https://github.com/matrix-org/matrix-react-sdk/pull/9563)). Fixes #23733. + * Fix read receipts trickling down correctly ([\#9567](https://github.com/matrix-org/matrix-react-sdk/pull/9567)). Fixes #23746. + * Resilience fix for homeserver without thread notification support ([\#9565](https://github.com/matrix-org/matrix-react-sdk/pull/9565)). + * Don't switch to the home page needlessly after leaving a room ([\#9477](https://github.com/matrix-org/matrix-react-sdk/pull/9477)). + * Differentiate download and decryption errors when showing images ([\#9562](https://github.com/matrix-org/matrix-react-sdk/pull/9562)). Fixes #3892. + * Close context menu when a modal is opened to prevent user getting stuck ([\#9560](https://github.com/matrix-org/matrix-react-sdk/pull/9560)). Fixes #15610 and #10781. + * Fix TimelineReset handling when no room associated ([\#9553](https://github.com/matrix-org/matrix-react-sdk/pull/9553)). + * Always use current profile on thread events ([\#9524](https://github.com/matrix-org/matrix-react-sdk/pull/9524)). Fixes #23648. + * Fix `ThreadView` tests not using thread flag ([\#9547](https://github.com/matrix-org/matrix-react-sdk/pull/9547)). Contributed by @MadLittleMods. + * Handle deletion of `m.call` events ([\#9540](https://github.com/matrix-org/matrix-react-sdk/pull/9540)). Fixes #23663. + * Fix incorrect notification count after leaving a room with notifications ([\#9518](https://github.com/matrix-org/matrix-react-sdk/pull/9518)). Contributed by @Arnei. + Changes in [1.11.14](https://github.com/vector-im/element-web/releases/tag/v1.11.14) (2022-11-08) ================================================================================================= From 75df90d83837d8e1b11510fada0d6f4c934f3cb5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 15 Nov 2022 18:12:11 +0000 Subject: [PATCH 4/8] v1.11.15-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b296c0ee..97fece692 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.14", + "version": "1.11.15-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From c777be5102f85612ffc6da816737d7bceb3fb88f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Nov 2022 11:51:18 +0000 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 21.2.0 --- package.json | 2 +- yarn.lock | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 97fece692..94dd19bb7 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.16.0", - "matrix-js-sdk": "21.2.0-rc.1", + "matrix-js-sdk": "21.2.0", "matrix-react-sdk": "3.61.0-rc.1", "matrix-widget-api": "^1.1.1", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 4c7dd4f59..957b5aa9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8265,6 +8265,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@21.2.0: + version "21.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.2.0.tgz#380d50510b08cede504db720fe4b9597bb72dc60" + integrity sha512-5aHWkWve+/5dmRJGIAzwe2hFNHX/2LBFWVqHh6YOTSViWlAbBxQsylBIhsNppgmHUN1YjBhvBlW206UnYCk6zg== + dependencies: + "@babel/runtime" "^7.12.5" + "@types/sdp-transform" "^2.4.5" + 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.0.0" + p-retry "4" + qs "^6.9.6" + sdp-transform "^2.14.1" + unhomoglyph "^1.0.6" + matrix-js-sdk@21.2.0-rc.1: version "21.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.2.0-rc.1.tgz#8fe43ab89962d62ae7a35eba3d5689bad8b60fce" From 1ec2155cc25519cd3adad208edf3977d5821d6fa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Nov 2022 12:02:58 +0000 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.61.0 --- package.json | 2 +- yarn.lock | 28 +++++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 94dd19bb7..c78781427 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.16.0", "matrix-js-sdk": "21.2.0", - "matrix-react-sdk": "3.61.0-rc.1", + "matrix-react-sdk": "3.61.0", "matrix-widget-api": "^1.1.1", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 957b5aa9a..5e219d7d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8283,24 +8283,6 @@ matrix-js-sdk@21.2.0: sdp-transform "^2.14.1" unhomoglyph "^1.0.6" -matrix-js-sdk@21.2.0-rc.1: - version "21.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-21.2.0-rc.1.tgz#8fe43ab89962d62ae7a35eba3d5689bad8b60fce" - integrity sha512-PQfTY1FC8pa8FtkrSJdLQ1yTWLZ+ZeAavhk+S8Og5MKc8g618zJelOVA/7XQJgCdGNEOb29L9yKSfsl1qHFrtQ== - dependencies: - "@babel/runtime" "^7.12.5" - "@types/sdp-transform" "^2.4.5" - 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.0.0" - p-retry "4" - qs "^6.9.6" - sdp-transform "^2.14.1" - unhomoglyph "^1.0.6" - matrix-mock-request@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.5.0.tgz#78da2590e82be2e31edcf9814833af5e5f8d2f1a" @@ -8308,10 +8290,10 @@ matrix-mock-request@^2.5.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.61.0-rc.1: - version "3.61.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.61.0-rc.1.tgz#dd9f75fad3693c74eff1be0236fa32c692de7af6" - integrity sha512-fcPOcHtRSp0bWjY2sPgDttG4oO/4KDX8GALZHtZqMjoyiXly56aY7ubxq3Y1x/O7FgU/RNN8P3fSqkZzo+y2fw== +matrix-react-sdk@3.61.0: + version "3.61.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.61.0.tgz#8f8349b9e3ef402cadb716bd1bab16f1246b9f38" + integrity sha512-FMoIuVaKuOCx69P3I8EY0ixARYHpiF0BcLFKYQFmsHtmA5lv5J8LOJKLGjFoJU+X0zAIkLiwQ5OzEGFnRoHEMg== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.3.0" @@ -8351,7 +8333,7 @@ matrix-react-sdk@3.61.0-rc.1: maplibre-gl "^1.15.2" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "0.0.1" - matrix-js-sdk "21.2.0-rc.1" + matrix-js-sdk "21.2.0" matrix-widget-api "^1.1.1" minimist "^1.2.5" opus-recorder "^8.0.3" From e9df9428cdd1df20c6492c941763339cb02a51da Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Nov 2022 12:12:11 +0000 Subject: [PATCH 7/8] Prepare changelog for v1.11.15 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dc9a9b72..7b2469f35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Changes in [1.11.15-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.15-rc.1) (2022-11-15) -=========================================================================================================== +Changes in [1.11.15](https://github.com/vector-im/element-web/releases/tag/v1.11.15) (2022-11-22) +================================================================================================= ## ✨ Features * Make clear notifications work with threads ([\#9575](https://github.com/matrix-org/matrix-react-sdk/pull/9575)). Fixes #23751. From 8c271f3d2dfe8f157b5a1ccc87276b725d01b611 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 22 Nov 2022 12:12:12 +0000 Subject: [PATCH 8/8] v1.11.15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c78781427..cb2743394 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.15-rc.1", + "version": "1.11.15", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {