From 46dcd771f170cfbde649587da76ff6c2e9191b89 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 13:27:05 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 19.5.0-rc.4 --- package.json | 2 +- yarn.lock | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5bf8ff0b4c..155e3c8146 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.12.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "19.5.0-rc.4", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "matrix-widget-api": "^1.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 473dfe7b49..4de2a30a1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7961,6 +7961,23 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== +matrix-js-sdk@19.5.0-rc.4: + version "19.5.0-rc.4" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.5.0-rc.4.tgz#38ee9be2b79e804743b0788a4dfa11e13143ba1c" + integrity sha512-pdZ90wf4gWUqm1Mx5plXjbCI4COH2N51skuOCcz5uooN5Q70UimB+qWDM8g4kT/snJaQfaxMD/E828ZOnLNXUg== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^5.0.0" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "4" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "19.4.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cbcf47d5c01b6799f85f8499124a042bdd37c061" From c3d4bfc05e7d5da605b4f6dc8d8c04f2996e776a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 13:33:03 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.54.0-rc.1 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 155e3c8146..d436bb2249 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.12.0", "matrix-js-sdk": "19.5.0-rc.4", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.54.0-rc.1", "matrix-widget-api": "^1.0.0", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 4de2a30a1f..416c89aa05 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7978,22 +7978,6 @@ matrix-js-sdk@19.5.0-rc.4: request "^2.88.2" unhomoglyph "^1.0.6" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "19.4.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cbcf47d5c01b6799f85f8499124a042bdd37c061" - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "4" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.1.2.tgz#11e38ed1233dced88a6f2bfba1684d5c5b3aa2c2" @@ -8001,9 +7985,10 @@ matrix-mock-request@^2.0.0: dependencies: expect "^28.1.0" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.53.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d85d79d92b09c4647c61b31b3c899529c97f221a" +matrix-react-sdk@3.54.0-rc.1: + version "3.54.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.54.0-rc.1.tgz#dd0b52fe78e4d29cfdee3a6ada896cf18d9b99b4" + integrity sha512-8/WqKXGq8A+s9ekW7aGx8bOu7081KVWltJ9k6our5Od02/BgpPDbOAKl1Iz3E+Td0aKD927qmAH7xxf7DPTKdw== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.2.0" @@ -8043,7 +8028,7 @@ matrix-mock-request@^2.0.0: 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-js-sdk "19.5.0-rc.4" matrix-widget-api "^1.0.0" minimist "^1.2.5" opus-recorder "^8.0.3" From b279ebe97ec39b66abadbb517299bcc8c9724d7f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 13:37:06 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.11.5-rc.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a30ce28ab..a43ad7c24a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +Changes in [1.11.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.5-rc.1) (2022-09-06) +========================================================================================================= + +## ✨ Features + * Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](https://github.com/matrix-org/matrix-react-sdk/pull/9228)). Contributed by @kerryarchibald. + * Device manager - scroll to filtered list from security recommendations ([\#9227](https://github.com/matrix-org/matrix-react-sdk/pull/9227)). Contributed by @kerryarchibald. + * Device manager - updated dropdown style in filtered device list ([\#9226](https://github.com/matrix-org/matrix-react-sdk/pull/9226)). Contributed by @kerryarchibald. + * Device manager - device type and verification icons on device tile ([\#9197](https://github.com/matrix-org/matrix-react-sdk/pull/9197)). Contributed by @kerryarchibald. + +## 🐛 Bug Fixes + * Description of DM room with more than two other people is now being displayed correctly ([\#9231](https://github.com/matrix-org/matrix-react-sdk/pull/9231)). Fixes #23094. + * Fix voice messages with multiple composers ([\#9208](https://github.com/matrix-org/matrix-react-sdk/pull/9208)). Fixes #23023. Contributed by @grimhilt. + * Fix suggested rooms going missing ([\#9236](https://github.com/matrix-org/matrix-react-sdk/pull/9236)). Fixes #23190. + * Fix tooltip infinitely recursing ([\#9235](https://github.com/matrix-org/matrix-react-sdk/pull/9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077. + * Fix plain text export saving ([\#9230](https://github.com/matrix-org/matrix-react-sdk/pull/9230)). Contributed by @jryans. + * Add missing space in SecurityRoomSettingsTab ([\#9222](https://github.com/matrix-org/matrix-react-sdk/pull/9222)). Contributed by @gefgu. + * Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](https://github.com/matrix-org/matrix-react-sdk/pull/9209)). Fixes #21369. + * Fix progress bar regression throughout the app ([\#9219](https://github.com/matrix-org/matrix-react-sdk/pull/9219)). Fixes #23121. + * Reuse empty string & space string logic for event types in devtools ([\#9218](https://github.com/matrix-org/matrix-react-sdk/pull/9218)). Fixes #23115. + Changes in [1.11.4](https://github.com/vector-im/element-web/releases/tag/v1.11.4) (2022-08-31) =============================================================================================== From dcf41fc1a7235a7ee367cb82d8aaf6c6e6d2a981 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 13:37:06 +0100 Subject: [PATCH 4/8] v1.11.5-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d436bb2249..64bb669167 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.4", + "version": "1.11.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 226e189c4a8b5db88cbaead8ab4bc0e8a21d3ea8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 13:02:26 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 19.5.0 --- package.json | 2 +- yarn.lock | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 64bb669167..86c25443e5 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.5.25", "katex": "^0.12.0", - "matrix-js-sdk": "19.5.0-rc.4", + "matrix-js-sdk": "19.5.0", "matrix-react-sdk": "3.54.0-rc.1", "matrix-widget-api": "^1.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 416c89aa05..8dcc5405b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7961,6 +7961,23 @@ matrix-events-sdk@^0.0.1-beta.7: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934" integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA== +matrix-js-sdk@19.5.0: + version "19.5.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.5.0.tgz#debc8e92b2e73204c8d5bc9a128a2d0ec0a92ade" + integrity sha512-WTmXMwyhGjUVv3eR71P9wdZj4qqNPgzg9Ud7V6kB3avhZJTZlIpNdHuldXXUdPJ8WTDKY+/yDtEFLIg8pj2Q8A== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^5.0.0" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.7" + p-retry "4" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-js-sdk@19.5.0-rc.4: version "19.5.0-rc.4" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.5.0-rc.4.tgz#38ee9be2b79e804743b0788a4dfa11e13143ba1c" From f5ffd4dd77e36cc6e10541eb2f0c48bdaa62c56e Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 13:03:03 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.54.0 --- package.json | 2 +- yarn.lock | 27 +++++---------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 86c25443e5..73602a2c53 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "jsrsasign": "^10.5.25", "katex": "^0.12.0", "matrix-js-sdk": "19.5.0", - "matrix-react-sdk": "3.54.0-rc.1", + "matrix-react-sdk": "3.54.0", "matrix-widget-api": "^1.0.0", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index 8dcc5405b7..a7e6b2cf82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7978,23 +7978,6 @@ matrix-js-sdk@19.5.0: request "^2.88.2" unhomoglyph "^1.0.6" -matrix-js-sdk@19.5.0-rc.4: - version "19.5.0-rc.4" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.5.0-rc.4.tgz#38ee9be2b79e804743b0788a4dfa11e13143ba1c" - integrity sha512-pdZ90wf4gWUqm1Mx5plXjbCI4COH2N51skuOCcz5uooN5Q70UimB+qWDM8g4kT/snJaQfaxMD/E828ZOnLNXUg== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^5.0.0" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.7" - p-retry "4" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-mock-request@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-2.1.2.tgz#11e38ed1233dced88a6f2bfba1684d5c5b3aa2c2" @@ -8002,10 +7985,10 @@ matrix-mock-request@^2.0.0: dependencies: expect "^28.1.0" -matrix-react-sdk@3.54.0-rc.1: - version "3.54.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.54.0-rc.1.tgz#dd0b52fe78e4d29cfdee3a6ada896cf18d9b99b4" - integrity sha512-8/WqKXGq8A+s9ekW7aGx8bOu7081KVWltJ9k6our5Od02/BgpPDbOAKl1Iz3E+Td0aKD927qmAH7xxf7DPTKdw== +matrix-react-sdk@3.54.0: + version "3.54.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.54.0.tgz#fadff4178a3cac87542b15a760c12bec2b41a00d" + integrity sha512-RpbXNUA7nRov67FP/bXZkuJR2z59vmkJ10HPKoOl2aj0ry1nvrjWItIVcr+JVe51tGzV/quFm1NVFd9Z3x7lsQ== dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/analytics-events" "^0.2.0" @@ -8045,7 +8028,7 @@ matrix-react-sdk@3.54.0-rc.1: maplibre-gl "^1.15.2" matrix-encrypt-attachment "^1.0.3" matrix-events-sdk "^0.0.1-beta.7" - matrix-js-sdk "19.5.0-rc.4" + matrix-js-sdk "19.5.0" matrix-widget-api "^1.0.0" minimist "^1.2.5" opus-recorder "^8.0.3" From a5e00ae57c11de67493e92f25a8df3c25a3bad36 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 13:05:08 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.11.5 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a43ad7c24a..c0a8aa9172 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Changes in [1.11.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.11.5-rc.1) (2022-09-06) -========================================================================================================= +Changes in [1.11.5](https://github.com/vector-im/element-web/releases/tag/v1.11.5) (2022-09-13) +=============================================================================================== ## ✨ Features * Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](https://github.com/matrix-org/matrix-react-sdk/pull/9228)). Contributed by @kerryarchibald. From 75116b33619683c7e93d47c22d81206adf6cca61 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 13:05:08 +0100 Subject: [PATCH 8/8] v1.11.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 73602a2c53..07af95a6bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.11.5-rc.1", + "version": "1.11.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {