From 17733b863f962dac156983ef5b1608e944849dc0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 12:50:48 +0100 Subject: [PATCH 1/7] Upgrade matrix-js-sdk to 19.5.0-rc.4 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5c90e917dd..2951c6c9bd 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "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", diff --git a/yarn.lock b/yarn.lock index 56dceb9fff..ad66d9f6a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6780,9 +6780,10 @@ 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@github:matrix-org/matrix-js-sdk#develop": - version "19.4.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cbcf47d5c01b6799f85f8499124a042bdd37c061" +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" From 023a9cf4cc0ce730e3cd2ca383c937c45f01f85d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 13:04:34 +0100 Subject: [PATCH 2/7] Prepare changelog for v3.54.0-rc.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09cbd0b516..b69a4fee8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +Changes in [3.54.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.54.0-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 vector-im/element-web#23094. + * Fix voice messages with multiple composers ([\#9208](https://github.com/matrix-org/matrix-react-sdk/pull/9208)). Fixes vector-im/element-web#23023. Contributed by @grimhilt. + * Fix suggested rooms going missing ([\#9236](https://github.com/matrix-org/matrix-react-sdk/pull/9236)). Fixes vector-im/element-web#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 vector-im/element-web#21369. + * Fix progress bar regression throughout the app ([\#9219](https://github.com/matrix-org/matrix-react-sdk/pull/9219)). Fixes vector-im/element-web#23121. + * Reuse empty string & space string logic for event types in devtools ([\#9218](https://github.com/matrix-org/matrix-react-sdk/pull/9218)). Fixes vector-im/element-web#23115. + Changes in [3.53.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.53.0) (2022-08-31) ===================================================================================================== From 35b75d77a1466deb6e5582ec40c8790e483784ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 6 Sep 2022 13:04:34 +0100 Subject: [PATCH 3/7] v3.54.0-rc.1 --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2951c6c9bd..fbdd5bf17e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.53.0", + "version": "3.54.0-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { @@ -23,7 +23,7 @@ "package.json", ".stylelintrc.js" ], - "main": "./src/index.ts", + "main": "./lib/index.ts", "matrix_src_main": "./src/index.ts", "matrix_lib_main": "./lib/index.ts", "matrix_lib_typings": "./lib/index.d.ts", @@ -252,5 +252,6 @@ "jestSonar": { "reportPath": "coverage", "sonar56x": true - } + }, + "typings": "./lib/index.d.ts" } From 9d0c3faa40528c0f7234e0c9846603521ddd2e62 Mon Sep 17 00:00:00 2001 From: ElementRobot Date: Mon, 12 Sep 2022 09:09:05 +0100 Subject: [PATCH 4/7] Fix issue with quiet zone around QR code (#9243) (#9257) (cherry picked from commit b651b1c0c5957dd42e3099e49c249ce184a6dc56) Co-authored-by: Janne Mareike Koschinski --- res/css/views/dialogs/_AppDownloadDialog.pcss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/res/css/views/dialogs/_AppDownloadDialog.pcss b/res/css/views/dialogs/_AppDownloadDialog.pcss index 776171ad09..e0591ed7e9 100644 --- a/res/css/views/dialogs/_AppDownloadDialog.pcss +++ b/res/css/views/dialogs/_AppDownloadDialog.pcss @@ -29,6 +29,9 @@ gap: $spacing-16; .mx_QRCode { + /* intentionally hardcoded color to ensure the QR code is readable in any situation */ + background: #ffffff; + padding: $spacing-24; border: 1px solid $quinary-content; border-radius: 4px; From a1ab983e91df9d897bf5acdf88dad5f439ef4555 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 12:46:37 +0100 Subject: [PATCH 5/7] Upgrade matrix-js-sdk to 19.5.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fbdd5bf17e..811111125b 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "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", diff --git a/yarn.lock b/yarn.lock index ad66d9f6a5..0a55361bfb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6780,10 +6780,10 @@ 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== +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" From 5f94138597f4b543330783c51dd61b0eec56fbf8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 12:48:19 +0100 Subject: [PATCH 6/7] Prepare changelog for v3.54.0 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b69a4fee8d..9b9e2c31e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Changes in [3.54.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.54.0-rc.1) (2022-09-06) -=============================================================================================================== +Changes in [3.54.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.54.0) (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 68b3fd78c2759b6b1c6de6f86c93a3e021db36ec Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 13 Sep 2022 12:48:20 +0100 Subject: [PATCH 7/7] v3.54.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 811111125b..0661344340 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "3.54.0-rc.1", + "version": "3.54.0", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {