From a3585c1febac0d39b12b6e69b8342ea9f0a294ed Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 14:56:24 +0000 Subject: [PATCH 1/9] react-sdk & js-sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7a14671f81..b88c744be1 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.13.1", - "matrix-js-sdk": "1.0.1", - "matrix-react-sdk": "1.0.3", + "matrix-js-sdk": "1.0.2-rc.1", + "matrix-react-sdk": "1.0.4-rc.1", "modernizr": "^3.6.0", "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz", "prop-types": "^15.6.2", From 9280d1ff4936023bf16361b0dc7f07584076db64 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 14:57:52 +0000 Subject: [PATCH 2/9] yarn neds --new-version to make a new version --- release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release.sh b/release.sh index ff3e2ce6dc..33b3676f1b 100755 --- a/release.sh +++ b/release.sh @@ -41,7 +41,7 @@ tag="v${release}" echo "electron yarn version" cd electron_app -yarn version --no-git-tag-version "$release" +yarn version --no-git-tag-version --new-version "$release" git commit package.json -m "$tag" cd .. From 958e8662d995a270d5dff91f01656192025b3782 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 14:58:28 +0000 Subject: [PATCH 3/9] v1.0.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 81985294b9..2b2a71af3c 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": "1.0.3", + "version": "1.0.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 98ed6a6a29547665a5f63103588ba3d221c287f1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 15:00:17 +0000 Subject: [PATCH 4/9] Prepare changelog for v1.0.4-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd9256cb2d..7b4d1ebe1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.0.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.4-rc.1) (2019-03-13) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.3...v1.0.4-rc.1) + + * Update from Weblate + [\#9152](https://github.com/vector-im/riot-web/pull/9152) + * Use modern Yarn version on Travis CI + [\#9151](https://github.com/vector-im/riot-web/pull/9151) + * Switch to `yarn` for dependency management + [\#9132](https://github.com/vector-im/riot-web/pull/9132) + * Update from Weblate + [\#9104](https://github.com/vector-im/riot-web/pull/9104) + * Don't copy the 32 bit linux deb + [\#9075](https://github.com/vector-im/riot-web/pull/9075) + * Change olm dependency to normal dep + [\#9068](https://github.com/vector-im/riot-web/pull/9068) + * Add modular.im hosting link to electron app config + [\#9047](https://github.com/vector-im/riot-web/pull/9047) + * Nudge karma to 3.1.2 + [\#8991](https://github.com/vector-im/riot-web/pull/8991) + * Add support for localConfig at $appData/config.json. + [\#8983](https://github.com/vector-im/riot-web/pull/8983) + Changes in [1.0.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.3) (2019-03-06) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2...v1.0.3) From bf721d031a5b2df08399f39a9844c96c100d5283 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 13 Mar 2019 15:00:17 +0000 Subject: [PATCH 5/9] v1.0.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b88c744be1..c3d9c0fdf4 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.3", + "version": "1.0.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 59ebb15fe9b4ec46cc4adcbd313e5d0c19bcbaf8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:11:09 +0000 Subject: [PATCH 6/9] Released js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c3d9c0fdf4..40fab94d7a 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.13.1", - "matrix-js-sdk": "1.0.2-rc.1", - "matrix-react-sdk": "1.0.4-rc.1", + "matrix-js-sdk": "1.0.2", + "matrix-react-sdk": "1.0.4", "modernizr": "^3.6.0", "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz", "prop-types": "^15.6.2", From 5254cef98066377405806734527cc0ad224c4e31 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:11:52 +0000 Subject: [PATCH 7/9] v1.0.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 2b2a71af3c..cb3c909237 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": "1.0.4-rc.1", + "version": "1.0.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 900141634336c8008d3982689da02cbe1ec83c3a Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:16:23 +0000 Subject: [PATCH 8/9] Prepare changelog for v1.0.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4d1ebe1d..33d2625160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.4](https://github.com/vector-im/riot-web/releases/tag/v1.0.4) (2019-03-18) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4-rc.1...v1.0.4) + + * No changes since rc.1 + Changes in [1.0.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.4-rc.1) (2019-03-13) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.3...v1.0.4-rc.1) From dceb2dd67129831d98cfc72c7f55a699a7fa8662 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 18 Mar 2019 14:16:23 +0000 Subject: [PATCH 9/9] v1.0.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40fab94d7a..2984bcf181 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.0.4-rc.1", + "version": "1.0.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {