From 2c227f68d460b157e50e554d7042db2bf928289c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 17 Jun 2020 21:49:00 +0100 Subject: [PATCH 1/8] Upgrade matrix-js-sdk to 7.0.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 e9c45d79..2dac63ed 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,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": "7.0.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", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 4e5e5baa..c9607dd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6973,6 +6973,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@7.0.0-rc.1: + version "7.0.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0-rc.1.tgz#95a258218f5c5ec73ec4be510b28768c35809a0b" + integrity sha512-1znl0d2UxU6Mmimy+pMSQP1lQfsmDb9jxiKV5sfMvTBsLtUE2cTqEBVDNVoOHL4UJ9U4oMLsrBgu3sELkgSJLQ== + 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 "6.2.2" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c194e81637fb07fe6ad67cda33be0d5d4c10115" From d587a8e910786fa30bac67b4d6b134481849d89a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 17 Jun 2020 21:49:25 +0100 Subject: [PATCH 2/8] Upgrade matrix-react-sdk to 2.8.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 2dac63ed..44f1b732 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "7.0.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "2.8.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index c9607dd1..5dd26aae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6988,20 +6988,6 @@ matrix-js-sdk@7.0.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "6.2.2" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1c194e81637fb07fe6ad67cda33be0d5d4c10115" - 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" @@ -7010,9 +6996,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 "2.7.2" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/6f6793bc858186d9eeaad9969914d016dd2a8f1b" +matrix-react-sdk@2.8.0-rc.1: + version "2.8.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.8.0-rc.1.tgz#ad4ec33606bb0126b1fbe9263927e26f9fc18d5a" + integrity sha512-a7HunK6FVLpasLZV5pNwis1CkQTC+dpXf2jyZ8frHSASLFkwlRMey9Jt6YG5xGMfzuYC17Y7DOesJ37Jk+bmUw== dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7040,7 +7027,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "7.0.0-rc.1" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From b954292e06ed327754ca294473c7eaf793d812bd Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 17 Jun 2020 21:52:13 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.6.6-rc.1 --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 920396d0..83824521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,37 @@ +Changes in [1.6.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.6-rc.1) (2020-06-17) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.5...v1.6.6-rc.1) + + * Upgrade to JS SDK 7.0.0-rc.1 and React SDK 2.8.0-rc.1 + * Update from Weblate + [\#14067](https://github.com/vector-im/riot-web/pull/14067) + * Update from Weblate + [\#14032](https://github.com/vector-im/riot-web/pull/14032) + * Attempt to fix decoder ring for relative hosted riots + [\#13987](https://github.com/vector-im/riot-web/pull/13987) + * Upgrade deps + [\#13952](https://github.com/vector-im/riot-web/pull/13952) + * Fix riot-desktop manual update check getting stuck on Downloading... + [\#13946](https://github.com/vector-im/riot-web/pull/13946) + * Bump websocket-extensions from 0.1.3 to 0.1.4 + [\#13943](https://github.com/vector-im/riot-web/pull/13943) + * Add e2ee-default:false docs + [\#13914](https://github.com/vector-im/riot-web/pull/13914) + * make IPC calls to get pickle key + [\#13846](https://github.com/vector-im/riot-web/pull/13846) + * fix loading test for new sso pattern + [\#13913](https://github.com/vector-im/riot-web/pull/13913) + * Fix login loop where the sso flow returns to `#/login` + [\#13889](https://github.com/vector-im/riot-web/pull/13889) + * Fix typo in docs + [\#13905](https://github.com/vector-im/riot-web/pull/13905) + * Remove cross-signing from labs + [\#13904](https://github.com/vector-im/riot-web/pull/13904) + * Add PWA Platform with PWA-specific badge controls + [\#13890](https://github.com/vector-im/riot-web/pull/13890) + * Modernizr check for subtle crypto as we require it all over the place + [\#13828](https://github.com/vector-im/riot-web/pull/13828) + Changes in [1.6.5](https://github.com/vector-im/riot-web/releases/tag/v1.6.5) (2020-06-16) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.4...v1.6.5) From d12f33fb58f58be4f2c7ad41c42b1db265b0ce76 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 17 Jun 2020 21:52:14 +0100 Subject: [PATCH 4/8] v1.6.6-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44f1b732..29243f42 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.5", + "version": "1.6.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ae7f3548118340bd62f06b17c1de6aa591f5c6f6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 23 Jun 2020 15:20:24 +0100 Subject: [PATCH 5/8] Upgrade matrix-js-sdk to 7.0.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 29243f42..3d7de447 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "7.0.0-rc.1", + "matrix-js-sdk": "7.0.0", "matrix-react-sdk": "2.8.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 5dd26aae..3fc8e166 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6973,6 +6973,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@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0.tgz#da2b24e57574379c3d8f7065eb68ea6c479d9806" + integrity sha512-0i1NmfwS5HzEPPjqUAXpw81o+8DImBS67QQBemJiM6D/imU3KFBacdhkmgjMLKXnAfTy6a+aCGfYBfVolfmNQw== + 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@7.0.0-rc.1: version "7.0.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0-rc.1.tgz#95a258218f5c5ec73ec4be510b28768c35809a0b" From b1c106e8b2cdd222a6217659525f9bbd48cdc411 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 23 Jun 2020 15:20:43 +0100 Subject: [PATCH 6/8] Upgrade matrix-react-sdk to 2.8.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 3d7de447..50b3388c 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "7.0.0", - "matrix-react-sdk": "2.8.0-rc.1", + "matrix-react-sdk": "2.8.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "postcss-easings": "^2.0.0", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 3fc8e166..08538ae9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6988,21 +6988,6 @@ matrix-js-sdk@7.0.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@7.0.0-rc.1: - version "7.0.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0-rc.1.tgz#95a258218f5c5ec73ec4be510b28768c35809a0b" - integrity sha512-1znl0d2UxU6Mmimy+pMSQP1lQfsmDb9jxiKV5sfMvTBsLtUE2cTqEBVDNVoOHL4UJ9U4oMLsrBgu3sELkgSJLQ== - 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" @@ -7011,10 +6996,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@2.8.0-rc.1: - version "2.8.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.8.0-rc.1.tgz#ad4ec33606bb0126b1fbe9263927e26f9fc18d5a" - integrity sha512-a7HunK6FVLpasLZV5pNwis1CkQTC+dpXf2jyZ8frHSASLFkwlRMey9Jt6YG5xGMfzuYC17Y7DOesJ37Jk+bmUw== +matrix-react-sdk@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.8.0.tgz#f020bfa29b7f2830815c3096d28b462c41686913" + integrity sha512-C/c4GNMtG3jGXC6QDebVQ6CzwgLzn/WuMsVUZJQBrFGjHsByMv7WmXVaLDbWYJh/qS/V+nL/Mz5Wm6hqeUUTFQ== dependencies: "@babel/runtime" "^7.8.3" await-lock "^2.0.1" @@ -7042,7 +7027,7 @@ matrix-react-sdk@2.8.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.6" lodash "^4.17.14" - matrix-js-sdk "7.0.0-rc.1" + matrix-js-sdk "7.0.0" minimist "^1.2.0" pako "^1.0.5" parse5 "^5.1.1" From abc4f42f83c27976c7ec9f0947e21695286057c9 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 23 Jun 2020 15:26:55 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.6.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83824521..370eb4dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.6](https://github.com/vector-im/riot-web/releases/tag/v1.6.6) (2020-06-23) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.6-rc.1...v1.6.6) + + * Upgrade to JS SDK 7.0.0 and React SDK 2.8.0 + Changes in [1.6.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.6.6-rc.1) (2020-06-17) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.5...v1.6.6-rc.1) From 42c6a26e9f8485d6bb0b19812fb29605cedeefe6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 23 Jun 2020 15:26:55 +0100 Subject: [PATCH 8/8] v1.6.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50b3388c..72827975 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.6.6-rc.1", + "version": "1.6.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {