From b46c241c965c3be94b6241cfaab470b03aac31aa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 17 Feb 2022 12:11:12 +0000 Subject: [PATCH 1/4] Upgrade matrix-js-sdk to 15.5.2 --- package.json | 2 +- yarn.lock | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9c96d18639..6e449b1e99 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "jsrsasign": "^10.2.0", "katex": "^0.12.0", - "matrix-js-sdk": "15.5.1", + "matrix-js-sdk": "15.5.2", "matrix-react-sdk": "3.40.0", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index bf6a6a84e7..f53595ad01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8047,7 +8047,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08" @@ -8073,6 +8073,23 @@ matrix-js-sdk@15.5.1: request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@15.5.2: + version "15.5.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.5.2.tgz#cdb37df107b33f383c4476ff25dc3759399da577" + integrity sha512-ohHTQs+w2gL3D+y4fL0yjahAyUUahDyvcIJoo+L+szmzqSmCJ65J14BYgIUmVcTd2ZMUzgAKVDq/LcfQd23FyA== + dependencies: + "@babel/runtime" "^7.12.5" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.1" + matrix-events-sdk "^0.0.1-beta.6" + p-retry "^4.5.0" + qs "^6.9.6" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From bae36cbc594942a8dea02abc1a433620397f99e1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 17 Feb 2022 12:11:41 +0000 Subject: [PATCH 2/4] Upgrade matrix-react-sdk to 3.40.1 --- package.json | 2 +- yarn.lock | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 6e449b1e99..0219082975 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "jsrsasign": "^10.2.0", "katex": "^0.12.0", "matrix-js-sdk": "15.5.2", - "matrix-react-sdk": "3.40.0", + "matrix-react-sdk": "3.40.1", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", diff --git a/yarn.lock b/yarn.lock index f53595ad01..85e2b297a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8047,7 +8047,7 @@ mathml-tag-names@^2.1.3: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -"matrix-analytics-events@github:matrix-org/matrix-analytics-events.git#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08": +"matrix-analytics-events@github:matrix-org/matrix-analytics-events#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08": version "0.0.1" resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08" @@ -8056,23 +8056,6 @@ matrix-events-sdk@^0.0.1-beta.6: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.6.tgz#9001090ed2e2bf29efc113d6b29871bcc6520749" integrity sha512-VMqPXe3Bg4R9yC9PNqGv6bDFwWlVYadYxp0Ke1ihhXUCpGcx7e28kOYcqK2T3RxLXK4KK7VH4JRbY53Do3r+Fw== -matrix-js-sdk@15.5.1: - version "15.5.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.5.1.tgz#fb67b7f8c74414af71790d1ac0dbb99c1281ec2e" - integrity sha512-7oCrDRZ5NxfimfZgw9cM9a89WxBj1i3cDiwb8PLNv7KnYgnI6z06WUwha2EhohTUd2v69h2AdXSZi2jD6QuHBA== - dependencies: - "@babel/runtime" "^7.12.5" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.1" - matrix-events-sdk "^0.0.1-beta.6" - p-retry "^4.5.0" - qs "^6.9.6" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@15.5.2: version "15.5.2" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.5.2.tgz#cdb37df107b33f383c4476ff25dc3759399da577" @@ -8098,10 +8081,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.40.0: - version "3.40.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.40.0.tgz#0c9c7d536538121f318ac7914e5644060ff7ca2e" - integrity sha512-rv+EAFKDrMb+rQaeWyxeOEuAl0rhWj7JWMRcpD7QvQlz3ru7azGtCD1bQHPV9VZEIpR4PLMMWeNHX0tdv9d1yw== +matrix-react-sdk@3.40.1: + version "3.40.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.40.1.tgz#daa26b34dbd7e71497a54db3d04ad72c53445add" + integrity sha512-b214Yxv+6Ch6Q0RmBHGxutPt3Ew7xumtyzTMFHzIDIkkLB+0PoQTSSomT6g4T3YNcBwMstAwxzFaVu/1m42RlQ== dependencies: "@babel/runtime" "^7.12.5" "@sentry/browser" "^6.11.0" @@ -8138,7 +8121,7 @@ matrix-react-sdk@3.40.0: maplibre-gl "^1.15.2" matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#dfa6feaa12bcfc8e99b05a148e12fff7f9d62f08" matrix-events-sdk "^0.0.1-beta.6" - matrix-js-sdk "15.5.1" + matrix-js-sdk "15.5.2" matrix-widget-api "^0.1.0-beta.18" minimist "^1.2.5" opus-recorder "^8.0.3" From 6d042a6b3531d54bc6ddd9b23318b5ae1c6a91aa Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 17 Feb 2022 12:14:54 +0000 Subject: [PATCH 3/4] Prepare changelog for v1.10.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90b15fb930..d6ecda2b31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.10.4](https://github.com/vector-im/element-web/releases/tag/v1.10.4) (2022-02-17) +=============================================================================================== + +## 🐛 Bug Fixes + * Fix bug where badge colour on encrypted rooms may not be correct until anothe rmessage is sent + Changes in [1.10.3](https://github.com/vector-im/element-web/releases/tag/v1.10.3) (2022-02-14) =============================================================================================== From 8e480c72d386df8db261c7d01276d19fc6938695 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 17 Feb 2022 12:14:55 +0000 Subject: [PATCH 4/4] v1.10.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0219082975..684b169f22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.3", + "version": "1.10.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {