From 81a624146bd2f167e12121fec46c9632753bd912 Mon Sep 17 00:00:00 2001 From: gusttt <41129432+gusttt@users.noreply.github.com> Date: Tue, 4 Sep 2018 08:16:29 +0200 Subject: [PATCH 01/10] Small typo in release notes v0.16.3 Fixes #7273 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df33ec837..dbd053afb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Changes in [0.16.3](https://github.com/vector-im/riot-web/releases/tag/v0.16.3) * SECURITY FIX: This version (and release candidates) pull in an upstream security fix from electron to fix CVE-2018-15685. Electron users should update as soon as - possible. Riot-web run outsiude of Electron is unaffected. + possible. Riot-web run outside of Electron is unaffected. Changes in [0.16.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.2) (2018-08-31) ====================================================================================================== From 588369d297cddfa14cc6ae96f01c1651a509ec7b Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 4 Sep 2018 20:32:06 +0100 Subject: [PATCH 02/10] downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 thanks @ZerataX! :) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e67ab63a13..57688b59d8 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "minimist": "^1.2.0", "mkdirp": "^0.5.1", "mocha": "^2.4.5", - "parallelshell": "^3.0.2", + "parallelshell": "3.0.1", "postcss-extend": "^1.0.5", "postcss-import": "^9.0.0", "postcss-loader": "^1.2.2", From 09130582ad495e624ba224fc18e976a8a76d13d5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Sep 2018 14:38:16 +0100 Subject: [PATCH 03/10] 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 e67ab63a13..e5c1bb64be 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.9", - "matrix-react-sdk": "0.13.3", + "matrix-js-sdk": "0.11.0-rc.1", + "matrix-react-sdk": "0.13.4-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 42bac1620e44cd3c157630fd40df4a4b9213abf4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Sep 2018 14:39:20 +0100 Subject: [PATCH 04/10] v0.16.4-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 9e5cada14b..a518f9c2f0 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.3", + "version": "0.16.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From d5b42d99f2e096360266dc8204d6a9514727fc28 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Sep 2018 14:42:51 +0100 Subject: [PATCH 05/10] Prepare changelog for v0.16.4-rc.1 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1df33ec837..b251f4df68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +Changes in [0.16.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.4-rc.1) (2018-09-07) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3...v0.16.4-rc.1) + + * Update from Weblate. + [\#7296](https://github.com/vector-im/riot-web/pull/7296) + * Fix config not loading & mobileguide script being loaded in riot + [\#7288](https://github.com/vector-im/riot-web/pull/7288) + * Instructions for installing mobile apps + [\#7272](https://github.com/vector-im/riot-web/pull/7272) + * Tidy up index.js + [\#7265](https://github.com/vector-im/riot-web/pull/7265) + Changes in [0.16.3](https://github.com/vector-im/riot-web/releases/tag/v0.16.3) (2018-09-03) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.2...v0.16.3) From d6406b48fd128375b7cc6b6ab2e40963c153c7c6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Sep 2018 14:42:52 +0100 Subject: [PATCH 06/10] v0.16.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e5c1bb64be..00dc664283 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.3", + "version": "0.16.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From ce4c71ccfb321752ae31fa7e39634f3276204455 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Sep 2018 11:41:45 +0100 Subject: [PATCH 07/10] Released js-sdk & react-sdk --- package-lock.json | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 551700517a..2f775fd70f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "riot-web", - "version": "0.15.6", + "version": "0.16.4-rc.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 00dc664283..34ad9c255a 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.11.0-rc.1", - "matrix-react-sdk": "0.13.4-rc.1", + "matrix-js-sdk": "0.11.0", + "matrix-react-sdk": "0.13.4", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From d8aaae6d427265721a8ad6a9eae85842b108e798 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Sep 2018 11:42:20 +0100 Subject: [PATCH 08/10] v0.16.4 --- 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 a518f9c2f0..7a508cd273 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.4-rc.1", + "version": "0.16.4", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 8b0ae88987eb226a9e92063bbf88b1e9dcb5012d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Sep 2018 11:43:23 +0100 Subject: [PATCH 09/10] Prepare changelog for v0.16.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b251f4df68..1b1b1035df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.16.4](https://github.com/vector-im/riot-web/releases/tag/v0.16.4) (2018-09-10) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.4-rc.1...v0.16.4) + + * No changes since rc.1 + Changes in [0.16.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.4-rc.1) (2018-09-07) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3...v0.16.4-rc.1) From 0f9c8235e1088432f7edb0cf37cb00e4f0b9bcd5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 10 Sep 2018 11:43:23 +0100 Subject: [PATCH 10/10] v0.16.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34ad9c255a..5d9e7befc8 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.4-rc.1", + "version": "0.16.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {