From 00cf95e86b6c6525f2b592a3ce06f7262adbbda7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 2 Jun 2020 13:53:28 +0100 Subject: [PATCH 1/6] Upgrade matrix-js-sdk to 6.2.0-rc.1 --- package.json | 2 +- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8a634de..5c33dd7 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "6.2.0-rc.1", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 4e766f2..6f1363e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2862,9 +2862,10 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "6.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a4a7097c103da42075f2c70e070fd01fa6fb0d48" +matrix-js-sdk@6.2.0-rc.1: + version "6.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0-rc.1.tgz#467cc1dc9f59a95573da8bc5f9eeef76e5fdd792" + integrity sha512-bAg8muF2xP6kXLpbDSSWRTvkxV7QoF8H14RmMxAu4IWuQg/WB7BFcG7JZyGwyOD7gmPVPMIw8mHXGkUuh1mKtA== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From b9d00395ed46dbd610f3bf6cea276f4365e21be5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 2 Jun 2020 13:58:26 +0100 Subject: [PATCH 2/6] Prepare changelog for v1.6.3-rc.1 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb7521e..b3acfb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +Changes in [1.6.3-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.3-rc.1) (2020-06-02) +======================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.2...v1.6.3-rc.1) + + * Fix electron context menu copy/save-as + [\#96](https://github.com/vector-im/riot-desktop/pull/96) + * Fixed error in README.md/User-specified config.json + [\#97](https://github.com/vector-im/riot-desktop/pull/97) + * Update Modular hosting link + [\#92](https://github.com/vector-im/riot-desktop/pull/92) + * Enforce sandbox on all spawned BrowserWindow objects + [\#91](https://github.com/vector-im/riot-desktop/pull/91) + * Run before-quit on updates too to flush rageshake + [\#93](https://github.com/vector-im/riot-desktop/pull/93) + * Enable new room list labs flag + [\#87](https://github.com/vector-im/riot-desktop/pull/87) + * Add asar-webapp script + [\#59](https://github.com/vector-im/riot-desktop/pull/59) + * Bump acorn from 6.4.0 to 6.4.1 + [\#50](https://github.com/vector-im/riot-desktop/pull/50) + * Enable font scaling flag for nightly + [\#89](https://github.com/vector-im/riot-desktop/pull/89) + * Enable IRC UI labs flag in nightly + [\#88](https://github.com/vector-im/riot-desktop/pull/88) + * Update help message to fix broken url to electron docs + [\#86](https://github.com/vector-im/riot-desktop/pull/86) + Changes in [1.6.2](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.2) (2020-05-22) ============================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.1...v1.6.2) From aaa3e7107782faeb7364741a88717588b7a753b4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 2 Jun 2020 13:58:27 +0100 Subject: [PATCH 3/6] v1.6.3-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c33dd7..3a6f453 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.2", + "version": "1.6.3-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From d106d23e2ed4289ee51e23e3b0d6aa9f1ce1ad75 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Jun 2020 15:06:20 +0100 Subject: [PATCH 4/6] Upgrade matrix-js-sdk to 6.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3a6f453..4e47902 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.2.0-rc.1", + "matrix-js-sdk": "6.2.0", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 6f1363e..34020cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2862,10 +2862,10 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" -matrix-js-sdk@6.2.0-rc.1: - version "6.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0-rc.1.tgz#467cc1dc9f59a95573da8bc5f9eeef76e5fdd792" - integrity sha512-bAg8muF2xP6kXLpbDSSWRTvkxV7QoF8H14RmMxAu4IWuQg/WB7BFcG7JZyGwyOD7gmPVPMIw8mHXGkUuh1mKtA== +matrix-js-sdk@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0.tgz#b1aa6f23858ab3ee4b66be25d3e854f6e287d36b" + integrity sha512-dpx1EuJ98HtqE2YUeliTe9xjMOJlicJGRXa06Gr8RAL6WJM7buPgodOk0tRs461LzeilxmymqcGaB4og6o9RxA== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From e4aab364282c8713fbb1d17267eddf0d3278cdf8 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Jun 2020 15:19:32 +0100 Subject: [PATCH 5/6] Prepare changelog for v1.6.3 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3acfb6..6dcc6bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +Changes in [1.6.3](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.3) (2020-06-04) +============================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.3-rc.1...v1.6.3) + + Changes in [1.6.3-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.3-rc.1) (2020-06-02) ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.2...v1.6.3-rc.1) From cf2925853cc2744c9122669fb1a45f18755259d4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 4 Jun 2020 15:19:33 +0100 Subject: [PATCH 6/6] v1.6.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e47902..d7a2ccc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.3-rc.1", + "version": "1.6.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {