From de4550099e7768e95882da940ef33c8a5e1ee64f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:08:33 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 8.2.0-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 364bd9446d..f5cc71b3bc 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.2.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 4ff565f388..995edbd2c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.2.0-rc.1: + version "8.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0-rc.1.tgz#1870ab25af7062def4b757ca5da04199df269241" + integrity sha512-vZTZOIoYXTFTO+NgBnP+mJMdwNwlIF8GQPeqra+esyoKcas7jVumAwektu3SXhFJPy9vnmufs7zXx4geiNNkpA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" From 9163aee0fc8c87048d171e63d96add1cfefa8282 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:10:33 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.3.0-rc.1 --- package.json | 2 +- yarn.lock | 29 +++++++++++------------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f5cc71b3bc..0e1f2d9722 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.2.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.3.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 995edbd2c3..5cdeb76850 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.2.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - 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" @@ -7349,9 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.2.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/c91fc99d4bfd76808c99327979c1b7dbcb9bf093" +matrix-react-sdk@3.3.0-rc.1: + version "3.3.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0-rc.1.tgz#05211b733cb8a4d66db5aea3dde0caca231bb8ff" + integrity sha512-Lk8R5uWNxLAarc7T4WvKyaH/3G579inJxr742df803F84mUcvUTzho5rsoK6W51WBOGKtTx3Qat3B2Iz0X47YQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7379,7 +7366,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "8.2.0-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" @@ -7396,6 +7383,7 @@ matrix-mock-request@^1.2.3: react-transition-group "^4.4.1" resize-observer-polyfill "^1.5.1" sanitize-html "^1.27.1" + tar-js "^0.3.0" text-encoding-utf-8 "^1.0.2" url "^0.11.0" velocity-animate "^1.5.2" @@ -11365,6 +11353,11 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +tar-js@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/tar-js/-/tar-js-0.3.0.tgz#6949aabfb0ba18bb1562ae51a439fd0f30183a17" + integrity sha1-aUmqv7C6GLsVYq5RpDn9DzAYOhc= + tar@^4: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" From 172514f278fd60424d35704fcbaa928bb137bd15 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:14:53 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.7.5-rc.1 --- CHANGELOG.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ddf3956e..3a507a95b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,35 @@ +Changes in [1.7.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.5-rc.1) (2020-08-26) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4...v1.7.5-rc.1) + + * Upgrade to React SDK 3.3.0-rc.1 and JS SDK 8.2.0-rc.1 + * Update from Weblate + [\#15045](https://github.com/vector-im/element-web/pull/15045) + * Document .well-known E2EE secure backup setting + [\#15003](https://github.com/vector-im/element-web/pull/15003) + * Add docs for communities v2 prototyping feature flag + [\#15013](https://github.com/vector-im/element-web/pull/15013) + * Update links in README.md to point to Element + [\#14973](https://github.com/vector-im/element-web/pull/14973) + * Make kabyle translation available + [\#15027](https://github.com/vector-im/element-web/pull/15027) + * Change Riot to Element in readme + [\#15016](https://github.com/vector-im/element-web/pull/15016) + * Update links to element in the readme + [\#15014](https://github.com/vector-im/element-web/pull/15014) + * Link to Element in F-Droid as well + [\#15002](https://github.com/vector-im/element-web/pull/15002) + * Settings v3: Update documentation and configs for new feature flag behaviour + [\#14986](https://github.com/vector-im/element-web/pull/14986) + * Update jitsi.md with Element Android details + [\#14952](https://github.com/vector-im/element-web/pull/14952) + * TypeScript: enable es2019 lib for newer definitions + [\#14983](https://github.com/vector-im/element-web/pull/14983) + * Add reaction preview labs flags to develop + [\#14979](https://github.com/vector-im/element-web/pull/14979) + * Document new labs tweaks + [\#14958](https://github.com/vector-im/element-web/pull/14958) + Changes in [1.7.4](https://github.com/vector-im/element-web/releases/tag/v1.7.4) (2020-08-17) ============================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4-rc.1...v1.7.4) From 669a5e6d01443d4017ecf4dcddf58792392babc5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 26 Aug 2020 12:14:54 +0100 Subject: [PATCH 4/8] v1.7.5-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e1f2d9722..6a86767b16 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.4", + "version": "1.7.5-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a09ab52be3b2cf08b6026b9e17cb1fd02ead7b0a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:40:19 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 8.2.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6a86767b16..5f24641a77 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.2.0-rc.1", + "matrix-js-sdk": "8.2.0", "matrix-react-sdk": "3.3.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 5cdeb76850..64fefec1f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0.tgz#6fbdadcdc563e41671d407d772a4d52ec8adc480" + integrity sha512-yKF/H1Matgf4b7bfa/gOPNcgMEujogC1r89Au8ZYKfv3dmNdJupE9ktdGJ28QVeKIyF5Ew1stLI4MdGWT1gYPw== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.2.0-rc.1: version "8.2.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0-rc.1.tgz#1870ab25af7062def4b757ca5da04199df269241" From a20b9c4c24611b3877e93bb91200a0241e0078db Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:41:33 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.3.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 5f24641a77..74db6ed64c 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.2.0", - "matrix-react-sdk": "3.3.0-rc.1", + "matrix-react-sdk": "3.3.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 64fefec1f6..95fc188681 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.2.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.2.0-rc.1: - version "8.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.2.0-rc.1.tgz#1870ab25af7062def4b757ca5da04199df269241" - integrity sha512-vZTZOIoYXTFTO+NgBnP+mJMdwNwlIF8GQPeqra+esyoKcas7jVumAwektu3SXhFJPy9vnmufs7zXx4geiNNkpA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - 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" @@ -7350,10 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.3.0-rc.1: - version "3.3.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0-rc.1.tgz#05211b733cb8a4d66db5aea3dde0caca231bb8ff" - integrity sha512-Lk8R5uWNxLAarc7T4WvKyaH/3G579inJxr742df803F84mUcvUTzho5rsoK6W51WBOGKtTx3Qat3B2Iz0X47YQ== +matrix-react-sdk@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.3.0.tgz#42749f59151a1fbd8be81d917b7f2dfc406a4ad5" + integrity sha512-042QFASwbYYX69TQTzzSnRyaD4NXiME/Unn+GmUfWJBnGieuNaYb7ZFxVdUuPpks2UfHJF6xswsr1LpKWi92IQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.3.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.2.0-rc.1" + matrix-js-sdk "8.2.0" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 9104a07324d6d359540827ccc1c0454e07d8c612 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:46:12 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.7.5 --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a507a95b5..d21f06095b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +Changes in [1.7.5](https://github.com/vector-im/element-web/releases/tag/v1.7.5) (2020-09-01) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.5-rc.1...v1.7.5) + +## Security notice + +Element Web 1.7.5 fixes an issue where encrypted state events could break incoming call handling. +Thanks to @awesome-michael from Awesome Technologies for responsibly disclosing this via Matrix's +Security Disclosure Policy. + +## All changes + + * Upgrade to React SDK 3.3.0 and JS SDK 8.2.0 + Changes in [1.7.5-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.5-rc.1) (2020-08-26) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4...v1.7.5-rc.1) From a89661de44096fb78f9385a1147d64026fb783af Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 1 Sep 2020 17:46:13 +0100 Subject: [PATCH 8/8] v1.7.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74db6ed64c..02e86be012 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.5-rc.1", + "version": "1.7.5", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {