From 7ceaa4fd8e4189fd0474bdf7839dd88381da5367 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Mar 2020 22:06:00 +0000 Subject: [PATCH 01/11] Bump acorn from 6.4.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 12fec42..cae517a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -108,9 +108,9 @@ acorn-jsx@^5.0.0: integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== acorn@^6.0.7: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== agent-base@4, agent-base@^4.3.0: version "4.3.0" From d73915e8f2af7a8dead5f17c1fc088cb8c3c843d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 1 Apr 2020 12:33:06 +0100 Subject: [PATCH 02/11] Add asar-webapp script Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 1c62003..b396a1c 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "scripts": { "mkdirs": "mkdirp packages deploys", "fetch": "yarn run mkdirs && node scripts/fetch-package.js", + "asar-webapp": "asar p webapp webapp.asar", "start": "electron .", "lint": "eslint src/ scripts/ hak/", "build:native": "yarn run hak", From 3f3e0213a73709a5b0f6ea658c2001a320274bab Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:22:05 +0100 Subject: [PATCH 03/11] Upgrade matrix-js-sdk to 6.1.0-rc.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a6ae3ad..074e860 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.0.0", + "matrix-js-sdk": "6.1.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 cc26f65..6d249f8 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.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0.tgz#2374a583878073871a0202dc237691ef15540575" - integrity sha512-NBHb5JIKetCVhOdfETyhUL9lYs2M+v8W/uczTzW6IX9XFOtNaha8X82waXlRt6RJpZRm5aJveODkybvo9VOLtg== +matrix-js-sdk@6.1.0-rc.1: + version "6.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3" + integrity sha512-q3XScyroUwY3qTBglRgE1lldfrLlSML5nU4gJzXrEwn2gGpR1P4IU8aT8EcumyOmeZhrrysS2UEE9fWgUmhkBw== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From d71423181ec5bb81e9e2f18432d88e79123f911d Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:22:36 +0100 Subject: [PATCH 04/11] Prepare changelog for v1.6.1-rc.1 --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9514356..9984980 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ +Changes in [1.6.1-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1-rc.1) (2020-05-14) +======================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0...v1.6.1-rc.1) + + * Add CI scripts to install and link JS SDK + [\#85](https://github.com/vector-im/riot-desktop/pull/85) + * Use Xenial as the build image's base distribution + [\#84](https://github.com/vector-im/riot-desktop/pull/84) + * Persist GPG keys for Linux builds via Docker + [\#83](https://github.com/vector-im/riot-desktop/pull/83) + * Update README to mention profile support + [\#81](https://github.com/vector-im/riot-desktop/pull/81) + * Remove Conflicts from riot-desktop + [\#82](https://github.com/vector-im/riot-desktop/pull/82) + * Add a default Linux distribution + [\#79](https://github.com/vector-im/riot-desktop/pull/79) + * Remove invite only padlocks feature flag config + [\#77](https://github.com/vector-im/riot-desktop/pull/77) + * package.json: Bump the Seshat dep. + [\#75](https://github.com/vector-im/riot-desktop/pull/75) + * Remove encrypted message search feature flag + [\#74](https://github.com/vector-im/riot-desktop/pull/74) + * Update readme now it's the real source + [\#73](https://github.com/vector-im/riot-desktop/pull/73) + Changes in [1.6.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0) (2020-05-05) ============================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.6...v1.6.0) From d391ce62020623337f05107950b839b26fcce9f4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 14 May 2020 16:22:36 +0100 Subject: [PATCH 05/11] v1.6.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 074e860..48f2b3d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.0", + "version": "1.6.1-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 89318e403ab13b37cdc896be90e167275c72a163 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:11:17 +0100 Subject: [PATCH 06/11] Upgrade matrix-js-sdk to 6.1.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 48f2b3d..bc364cc 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.1.0-rc.1", + "matrix-js-sdk": "6.1.0", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 6d249f8..2d917fa 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.1.0-rc.1: - version "6.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0-rc.1.tgz#521d5683d10e49bb437b2457d1f0c6696fc7a4e3" - integrity sha512-q3XScyroUwY3qTBglRgE1lldfrLlSML5nU4gJzXrEwn2gGpR1P4IU8aT8EcumyOmeZhrrysS2UEE9fWgUmhkBw== +matrix-js-sdk@6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz#c28ad67c113c4aa9c8bce409c7ba550170bdc2ee" + integrity sha512-N+vCgxWORvhh7AGyWZlU5Z2brojbbnHnWlMkBF6JjWe6a+pfpjmRKp5/jeQpOz6yfe56sIQvU7ikBZl3JjlMiw== dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From 4069800a92ee36c7b368d0ecf92714458dcf1109 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:14:58 +0100 Subject: [PATCH 07/11] Prepare changelog for v1.6.1 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9984980..de04300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.6.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1) (2020-05-19) +============================================================================================== +[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.1-rc.1...v1.6.1) + + * No changes since rc.1 + Changes in [1.6.1-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.1-rc.1) (2020-05-14) ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0...v1.6.1-rc.1) @@ -27,11 +33,13 @@ Changes in [1.6.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0 ============================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.6...v1.6.0) + * No changes since rc.6 Changes in [1.6.0-rc.6](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.6) (2020-05-01) ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.5...v1.6.0-rc.6) + * No changes since rc.5 Changes in [1.6.0-rc.5](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.5) (2020-04-30) ======================================================================================================== @@ -46,6 +54,7 @@ Changes in [1.6.0-rc.4](https://github.com/vector-im/riot-desktop/releases/tag/v ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.3...v1.6.0-rc.4) + * No changes since rc.3 Changes in [1.6.0-rc.3](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.3) (2020-04-17) ======================================================================================================== @@ -58,6 +67,7 @@ Changes in [1.6.0-rc.2](https://github.com/vector-im/riot-desktop/releases/tag/v ======================================================================================================== [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.1...v1.6.0-rc.2) + * No changes since rc.1 Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.1) (2020-04-15) ======================================================================================================== From defac64eff7c2cdf69eb6ece88090ea0517d0ece Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:14:58 +0100 Subject: [PATCH 08/11] v1.6.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc364cc..cb72b09 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.1-rc.1", + "version": "1.6.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 3e8feef642806a18b6270ff8cc6d76314b1b1ef0 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Tue, 19 May 2020 11:16:19 +0100 Subject: [PATCH 09/11] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index cb72b09..717e7f0 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.1.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "mkdirp": "^1.0.3", "needle": "^2.3.2", "node-pre-gyp": "^0.14.0", diff --git a/yarn.lock b/yarn.lock index 2d917fa..4b6b90d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2862,10 +2862,9 @@ map-age-cleaner@^0.1.1: dependencies: p-defer "^1.0.0" -matrix-js-sdk@6.1.0: +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "6.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz#c28ad67c113c4aa9c8bce409c7ba550170bdc2ee" - integrity sha512-N+vCgxWORvhh7AGyWZlU5Z2brojbbnHnWlMkBF6JjWe6a+pfpjmRKp5/jeQpOz6yfe56sIQvU7ikBZl3JjlMiw== + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e3c6a0e1a08a3812ba988e60eb5a2a013bb27404" dependencies: "@babel/runtime" "^7.8.3" another-json "^0.2.0" From 96d272f76b3e376f76033bcb593e829dac79c77e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 19 May 2020 14:58:46 -0600 Subject: [PATCH 10/11] Enable IRC UI labs flag in nightly For https://github.com/vector-im/riot-web/pull/13350 --- riot.im/nightly/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/riot.im/nightly/config.json b/riot.im/nightly/config.json index eca0371..164bcb7 100644 --- a/riot.im/nightly/config.json +++ b/riot.im/nightly/config.json @@ -23,7 +23,8 @@ "feature_dm_verification": "labs", "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", - "feature_custom_themes": "labs" + "feature_custom_themes": "labs", + "feature_irc_ui": "labs" }, "piwik": { "url": "https://piwik.riot.im/", From 9b9b2ee847e445e34351ced7b4ad4961e614e7f7 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 20 May 2020 10:08:43 -0600 Subject: [PATCH 11/11] Enable font scaling flag for nightly --- riot.im/nightly/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/riot.im/nightly/config.json b/riot.im/nightly/config.json index 164bcb7..8262169 100644 --- a/riot.im/nightly/config.json +++ b/riot.im/nightly/config.json @@ -24,7 +24,8 @@ "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", "feature_custom_themes": "labs", - "feature_irc_ui": "labs" + "feature_irc_ui": "labs", + "feature_font_scaling": "labs" }, "piwik": { "url": "https://piwik.riot.im/",