From 6004d02b98742f1d5fd373c53c7a737c14b55afd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:33:19 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 8.0.1-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cf9f7bbe8..7c4f85e8fa 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.0.1-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 0d9337be30..6b05372b21 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.0.1-rc.1: + version "8.0.1-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" + integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== + 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.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" From 7f0c8216aecd48f6e7772306d761a4cad5f4dddf Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:35:05 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 3.1.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 7c4f85e8fa..3962b8acdc 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.0.1-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.1.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 6b05372b21..cc09e0d983 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.0.1-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c669382e12c8cd1d7d538421dfad4f50812af44d" - 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.0.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f9540dd7cd67666ad58beac9b11c7bc4a5872673" +matrix-react-sdk@3.1.0-rc.1: + version "3.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566" + integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg== 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.0.1-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 1a916435da24c5bb29096172428febe1ce3a09df Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:40:26 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.7.3-rc.1 --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8172453e1..625eefa35f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1) + + * Upgrade to React SDK 3.1.0-rc.1 and JS SDK 8.0.1-rc.1 + * Make Lojban translation available + [\#14703](https://github.com/vector-im/riot-web/pull/14703) + * Update from Weblate + [\#14841](https://github.com/vector-im/riot-web/pull/14841) + * Remove redundant lint dependencies + [\#14810](https://github.com/vector-im/riot-web/pull/14810) + * Bump elliptic from 6.5.2 to 6.5.3 + [\#14826](https://github.com/vector-im/riot-web/pull/14826) + * Update mobile config intercept URL + [\#14796](https://github.com/vector-im/riot-web/pull/14796) + * Fix typo in https:// + [\#14791](https://github.com/vector-im/riot-web/pull/14791) + Changes in [1.7.2](https://github.com/vector-im/riot-web/releases/tag/v1.7.2) (2020-07-27) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.1...v1.7.2) From 0b3487981cb2e80751adf0e519ecf15220c4078f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 31 Jul 2020 13:40:26 +0100 Subject: [PATCH 4/8] v1.7.3-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3962b8acdc..c128a656b2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.2", + "version": "1.7.3-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From d283b4161c43d80f4133213148dfa184160a8539 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:12:29 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 8.0.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c128a656b2..aefc1e4261 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.0.1-rc.1", + "matrix-js-sdk": "8.0.1", "matrix-react-sdk": "3.1.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 cc09e0d983..51e288a709 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.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1.tgz#dafd41023671249c01e4278e7103c93200b34e5e" + integrity sha512-DT2YjWi8l2eHyNTKZOhBkN/EakIMDDEglSCg+RWY4QzFaXYlSwfwfzzCujjtq1hxVSKim8NC7KqxgNetOiBegA== + 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.0.1-rc.1: version "8.0.1-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" From 6b7909c73217b7de2f33c1ca7b1f36e02d650e36 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:12:43 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 3.1.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index aefc1e4261..cfa11b1fe8 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.0.1", - "matrix-react-sdk": "3.1.0-rc.1", + "matrix-react-sdk": "3.1.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 51e288a709..43a04f5029 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.0.1: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.0.1-rc.1: - version "8.0.1-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.0.1-rc.1.tgz#dbc2544f0058e2530e84a5d3b3e1abe06e395597" - integrity sha512-K3wOAf8lVLBx3Xhgb57JoVtFRVf52PHDnsnj00ST4kCAbnlJ3iuJ8OuOX16Bbk0fvV7RLJi/At4bm1Ld6PsIkQ== - 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.1.0-rc.1: - version "3.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0-rc.1.tgz#dbf6a9b9ad5542075d8a894d4009d04bba149566" - integrity sha512-CJVlYARIYBKVBtoyDVPeBGH/rbqTgerWiYovqVq3+TG+DUDFZYSRXLRymxVwTSB23PKP1PJ8+MEOA0Yx2r2gmg== +matrix-react-sdk@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.1.0.tgz#d8349942e6aa705195b30415c96d7576b783f011" + integrity sha512-LNSm4gX+c9Z2z39QyaQTSZmIAEI5nmIZ7uVq2X3ktn0NwmGwTcvC983t68ooHmIzAqVmh4JrscgzmdvPqk/YPw== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.1.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.0.1-rc.1" + matrix-js-sdk "8.0.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From c411eabdac2c701d06997ac757d7587143c43cf1 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:15:16 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.7.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 625eefa35f..2a5d9fe75f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3-rc.1...v1.7.3) + + * Upgrade to React SDK 3.1.0 and JS SDK 8.0.1 + Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.7.3-rc.1) (2020-07-31) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.7.2...v1.7.3-rc.1) From f8102105a9b6313d2c49904a21228838391fad2d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 5 Aug 2020 16:15:17 +0100 Subject: [PATCH 8/8] v1.7.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cfa11b1fe8..73d4da7a82 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.3-rc.1", + "version": "1.7.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {