From 89ee32a32d5367de70c085571b1e446cfff93e80 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:20:15 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 8.1.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 d82c3d147f..07eb07d19f 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.1.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 1879a8f9c5..89ce1b5f9f 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.1.0-rc.1: + version "8.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" + integrity sha512-/qOSe0FQsbC2ITXhUbpjCIRAT78f2VHxKGqGMC2M2s5e2Mvpxcpu7lj/ONz5irUPd34Sqhj9KdIUnAqBbh3stQ== + 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.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" From 871733388c1187dbbbb82d16c3c5dd2a42a65c19 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:20:41 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.2.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 07eb07d19f..1fcbe305c6 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.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.2.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 89ce1b5f9f..deebd4460b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.1.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" - 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.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/45b79a0b7c9237c6b4dbafd37c1a234ed2b7cf35" +matrix-react-sdk@3.2.0-rc.1: + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0-rc.1.tgz#2dc7ca5d5ca4187a0973c8e2dee7e45c98923755" + integrity sha512-1BZW6WQBDlx0FhKAKBhVP2Oex2uRWSjzjKM3ccc/tHzih56XYFY4DUWf9Bd2jiPn2EyHQcwncmcFcDOC4bV4qQ== 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.1.0-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 4d95e7ec67b037697c6ae71d8604987ae424de79 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:23:40 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.7.4-rc.1 --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90d58b4932..a508ce4c48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1) + + * Upgrade to React SDK 3.2.0-rc.1 and JS SDK 8.1.0-rc.1 + * Update policy links to element.io + [\#14905](https://github.com/vector-im/element-web/pull/14905) + * Update from Weblate + [\#14949](https://github.com/vector-im/element-web/pull/14949) + * Try to close notification on all platforms which support it, not just + electron + [\#14939](https://github.com/vector-im/element-web/pull/14939) + * Update bug report submission URL + [\#14903](https://github.com/vector-im/element-web/pull/14903) + * Fix arm docker build + [\#14522](https://github.com/vector-im/element-web/pull/14522) + Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) ============================================================================================= From 05816fca36e7832242a6a45ac56ba4a6eef7b3b4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:23:41 +0100 Subject: [PATCH 4/8] v1.7.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fcbe305c6..35b75cc63e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.3", + "version": "1.7.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 16be9e477458d43ae90abbd047b9ed191989e125 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:09:04 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 8.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 35b75cc63e..46a09dc558 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.1.0-rc.1", + "matrix-js-sdk": "8.1.0", "matrix-react-sdk": "3.2.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 deebd4460b..5339b9104c 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.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0.tgz#c4e48b03a54455dda3d3e1c539ce31dbb46790ac" + integrity sha512-id/J1rBmooQWebCNO4we5W4w816+6LR503H6N1A3jn2CZl2etg86HOScmtGmw+4qkzjKJI5QkL30tvDyAJ+lxA== + 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.1.0-rc.1: version "8.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" From 5ac891d70e4edae950d421035ffaeb5399e20c8c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:09:23 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.2.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 46a09dc558..cedebc224f 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.1.0", - "matrix-react-sdk": "3.2.0-rc.1", + "matrix-react-sdk": "3.2.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 5339b9104c..e14b64c9b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.1.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.1.0-rc.1: - version "8.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" - integrity sha512-/qOSe0FQsbC2ITXhUbpjCIRAT78f2VHxKGqGMC2M2s5e2Mvpxcpu7lj/ONz5irUPd34Sqhj9KdIUnAqBbh3stQ== - 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.2.0-rc.1: - version "3.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0-rc.1.tgz#2dc7ca5d5ca4187a0973c8e2dee7e45c98923755" - integrity sha512-1BZW6WQBDlx0FhKAKBhVP2Oex2uRWSjzjKM3ccc/tHzih56XYFY4DUWf9Bd2jiPn2EyHQcwncmcFcDOC4bV4qQ== +matrix-react-sdk@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0.tgz#4523003c8dd72f9d7c9b53d5bec3cd67fe41c52f" + integrity sha512-yywvU2lJR0s/P3Suf5SDf3Aa/vHDZjwDiR14DBsHKdP97TyugA3LKogVkjfi192+m2sMFtl8AB/raplhSz/lNg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.2.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.1.0-rc.1" + matrix-js-sdk "8.1.0" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From a7ac9408b8e4913bdbddf202aa1ce7e2bde08007 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:12:41 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.7.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a508ce4c48..c7ddf3956e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +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) + + * Upgrade to React SDK 3.2.0 and JS SDK 8.1.0 + Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1) From 8aa46ba700530d9d8e05ec67f4c6d7c7530ba36f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:12:41 +0100 Subject: [PATCH 8/8] v1.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cedebc224f..67a4cf07d7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.4-rc.1", + "version": "1.7.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {