From 39b5e4b1e36e3f01d948a58764a5a660817a494f Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Oct 2018 17:16:22 +0200 Subject: [PATCH 01/15] update matrix-react-sdk to 0.13.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5409da7f96..d64dbda18f 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "matrix-js-sdk": "0.11.1", - "matrix-react-sdk": "0.13.5", + "matrix-react-sdk": "0.13.6", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From dec60a9c8593014a4d4b8dc9b34922902bbd351b Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Oct 2018 17:19:54 +0200 Subject: [PATCH 02/15] v0.16.6 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 206811e323..1996b2249b 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.16.5", + "version": "0.16.6", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 52954982a33d6fe2791ffba27ac6ba7ca198113e Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Oct 2018 17:21:35 +0200 Subject: [PATCH 03/15] Prepare changelog for v0.16.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b6f881c3..d3dfd4768c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.16.6](https://github.com/vector-im/riot-web/releases/tag/v0.16.6) (2018-10-08) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.16.6) + + * Update to matrix-react-sdk v0.13.6 + Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5) From 060a7807f00b7786ee0c9cbb76a46645a18f3b17 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Oct 2018 17:21:35 +0200 Subject: [PATCH 04/15] v0.16.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d64dbda18f..f88d1b16b0 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.16.5", + "version": "0.16.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ba51c0721ecaf01ee6f649d5213642bcdaa7c72f Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 11 Oct 2018 15:42:30 +0100 Subject: [PATCH 05/15] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e3ec97d199..cb2f3b389e 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.0.0", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "0.12.0-rc.1", + "matrix-react-sdk": "0.14.0-rc.1", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From 74f2266d8962b54705ec8c4d2e4c0873e5a4a553 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 11 Oct 2018 16:02:48 +0100 Subject: [PATCH 06/15] v0.17.0-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 206811e323..7c5b32ac1f 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.16.5", + "version": "0.17.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 848bd8f55342b7d85abf0ef2fbaec54451d53c95 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 11 Oct 2018 16:03:52 +0100 Subject: [PATCH 07/15] Prepare changelog for v0.17.0-rc.1 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26b6f881c3..35a49988b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +Changes in [0.17.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.0-rc.1) (2018-10-11) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.17.0-rc.1) + + * Revert "also commit the lock file when bumping version as it is now + committed to the repo" + [\#7483](https://github.com/vector-im/riot-web/pull/7483) + * Update from Weblate. + [\#7478](https://github.com/vector-im/riot-web/pull/7478) + * Fix riot-web Promise.defer warnings (#7409) + [\#7444](https://github.com/vector-im/riot-web/pull/7444) + * Use HTTPS cloning for riot-web too + [\#7459](https://github.com/vector-im/riot-web/pull/7459) + * Disable webpack-dev-server auto reload + [\#7463](https://github.com/vector-im/riot-web/pull/7463) + * Silence bluebird warnings + [\#7462](https://github.com/vector-im/riot-web/pull/7462) + * Fix reskindex on matrix-react-side not being called if using build script + [\#7443](https://github.com/vector-im/riot-web/pull/7443) + * Fix double-closed tags + [\#7454](https://github.com/vector-im/riot-web/pull/7454) + * Document how to turn off Piwik and bug reports (#6738) + [\#7435](https://github.com/vector-im/riot-web/pull/7435) + * also commit the lock file when bumping version as it is now committed to the + repo + [\#7429](https://github.com/vector-im/riot-web/pull/7429) + * Update a bunch of deps + [\#7393](https://github.com/vector-im/riot-web/pull/7393) + * Don't show mobile guide if deep linking + [\#7415](https://github.com/vector-im/riot-web/pull/7415) + * Don't show custom server bit on matrix.org + [\#7408](https://github.com/vector-im/riot-web/pull/7408) + * Update Webpack to version 4 + [\#6620](https://github.com/vector-im/riot-web/pull/6620) + * Webpack4 + [\#7387](https://github.com/vector-im/riot-web/pull/7387) + Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5) From 5ad9d2094aeeeb956078ecda029992629a8d6ba6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 11 Oct 2018 16:03:53 +0100 Subject: [PATCH 08/15] v0.17.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cb2f3b389e..85bb6e0caf 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.16.5", + "version": "0.17.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From a0e067510cdb97b2c7b063d4fb276d5bedfa1b05 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 15 Oct 2018 18:13:47 +0100 Subject: [PATCH 09/15] Update to latest electron builder Tested auto update on both windows (ia32) and mac, seems to work! --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 85bb6e0caf..a6d6762d50 100644 --- a/package.json +++ b/package.json @@ -100,8 +100,8 @@ "concurrently": "^4.0.1", "cpx": "^1.3.2", "cross-env": "^4.0.0", - "electron-builder": "^11.2.4", - "electron-builder-squirrel-windows": "^11.2.1", + "electron-builder": "^20.28.4", + "electron-builder-squirrel-windows": "^11.6.1", "electron-devtools-installer": "^2.2.4", "emojione": "^2.2.7", "eslint": "^5.6.0", @@ -150,12 +150,7 @@ }, "build": { "appId": "im.riot.app", - "category": "Network", "electronVersion": "3.0.3", - "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", - "asar": false, - "dereference": true, - "//files": "We bundle everything, so we only need to include webapp/", "files": [ "node_modules/**", "src/**", @@ -172,8 +167,13 @@ "StartupWMClass": "riot" } }, + "mac": { + "category": "public.app-category.social-networking" + }, "win": { - "target": "squirrel" + "target": { + "target": "squirrel" + } }, "directories": { "buildResources": "electron_app/build", From de7d3ba701fd6ae854361d158c49ef7364e89002 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Oct 2018 10:26:04 +0100 Subject: [PATCH 10/15] Change electron build script paths Because electron builder has decided to output the mac assets to somewhere else today. --- scripts/electron-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/electron-package.sh b/scripts/electron-package.sh index f0ba941478..bd68d9c2cc 100755 --- a/scripts/electron-package.sh +++ b/scripts/electron-package.sh @@ -100,7 +100,7 @@ mkdir -p "$projdir/electron_app/dist/unsigned/" # Install packages: what the user downloads the first time, # (DMGs for mac, exe installer for windows) mkdir -p "$pubdir/install/macos" -cp $distdir/mac/*.dmg "$pubdir/install/macos/" +cp $distdir/*.dmg "$pubdir/install/macos/" # Windows installers go to the dist dir because they need signing mkdir -p "$pubdir/install/win32/ia32/" @@ -111,7 +111,7 @@ cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/" # Packages for auto-update mkdir -p "$pubdir/update/macos" -cp $distdir/mac/*.zip "$pubdir/update/macos/" +cp $distdir/*-mac.zip "$pubdir/update/macos/" echo "$vername" > "$pubdir/update/macos/latest" mkdir -p "$pubdir/update/win32/ia32/" From 005e4aa1bd1eb38d0d9c5dcf45f219dcbe49c98c Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Oct 2018 10:43:15 +0100 Subject: [PATCH 11/15] Phased rollout of lazyloading --- electron_app/riot.im/config.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index 10b453a469..2a52a5117d 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -21,6 +21,15 @@ "siteId": 1, "policyUrl": "https://matrix.org/docs/guides/riot_im_cookie_policy" }, + "phasedRollOut": { + "feature_lazyloading": { + "offset": 1539684000000, + "period": 604800000 + } + }, + "features": { + "feature_lazyloading": "enable" + }, "enable_presence_by_hs_url": { "https://matrix.org": false } From 4afb5caa4e7d3cd4b59fa566491a3034032c9fb5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Oct 2018 10:58:29 +0100 Subject: [PATCH 12/15] Released js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a6d6762d50..7b935173e3 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.12.0-rc.1", - "matrix-react-sdk": "0.14.0-rc.1", + "matrix-js-sdk": "0.12.0", + "matrix-react-sdk": "0.14.0", "modernizr": "^3.6.0", "prop-types": "^15.6.2", "react": "^15.6.0", From 1fc8592ef65b36a08c2eb0c57e8d81155a7e1c64 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Oct 2018 10:59:18 +0100 Subject: [PATCH 13/15] v0.17.0 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 7c5b32ac1f..18847188d7 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "0.17.0-rc.1", + "version": "0.17.0", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 65cc3000eef1a9ca6d26afc1ffa6639cf1f9fb4b Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Oct 2018 11:00:39 +0100 Subject: [PATCH 14/15] Prepare changelog for v0.17.0 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a49988b0..49f4760feb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [0.17.0](https://github.com/vector-im/riot-web/releases/tag/v0.17.0) (2018-10-16) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.17.0-rc.1...v0.17.0) + + * Phased rollout of lazyloading + [\#7503](https://github.com/vector-im/riot-web/pull/7503) + * Update to latest electron builder + [\#7501](https://github.com/vector-im/riot-web/pull/7501) + Changes in [0.17.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.17.0-rc.1) (2018-10-11) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.17.0-rc.1) From 41540842eb44e72aaab97bebdc6c981d4f686ef3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 16 Oct 2018 11:00:39 +0100 Subject: [PATCH 15/15] v0.17.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b935173e3..73f0a1d7b6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "0.17.0-rc.1", + "version": "0.17.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {