From b18e4f079f4277e40781c465ff85d751ae961f40 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Oct 2019 17:00:22 +0100 Subject: [PATCH 1/8] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- yarn.lock | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index bd05b090df..d54338f6d9 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "2.4.2-rc.1", + "matrix-react-sdk": "1.7.0-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index b1eb8246f8..c87ac281aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5947,9 +5947,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "2.4.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e024d047e358cf26caa47542c8f6d9a469a11cb2" +matrix-js-sdk@2.4.2-rc.1: + version "2.4.2-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.2-rc.1.tgz#0601c8020e34b6c0ecde6216f86f56664d7a9357" + integrity sha512-s8Bjvw6EkQQshHXC+aM846FJQdXTUIIyh5s+FRpW08yxA3I38/guF9cpJyCD44gZozXr+8c8VFTJ4Af2rRyV7A== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5970,9 +5971,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "1.6.2" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/dc9018dc116299c2a8ae177b7fe6910458f14078" +matrix-react-sdk@1.7.0-rc.1: + version "1.7.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.0-rc.1.tgz#d58f4897269b9f64d29dc4a0ddf6b29a2dfbc666" + integrity sha512-Nsfstdz9KVfA4U6Aj0TVFuxLeQ4DbbG5+OlPjFU1tw+EM1LRcjecOWxiX1RPiHhQOTiEZbojMVp7tePo2NJaKw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6003,7 +6005,7 @@ matrix-mock-request@^1.2.3: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "2.4.2-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From f89fd9c8887b59cdf50a7a562a17c1f2744f8fe3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Oct 2019 17:35:48 +0100 Subject: [PATCH 2/8] v1.5.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 f7a70bce61..6409e56251 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.4.2", + "version": "1.5.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 358d27f2ba4dc93cf8a22c0196091a65aa505bf4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Oct 2019 17:37:00 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.5.0-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13c4cbe896..7a8aa2aa9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.5.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.0-rc.1) (2019-10-09) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.2...v1.5.0-rc.1) + + * Update from Weblate + [\#11104](https://github.com/vector-im/riot-web/pull/11104) + * Bump Olm to 3.1.4 for olm_session_describe + [\#11103](https://github.com/vector-im/riot-web/pull/11103) + * Enable Webpack production mode for start:js:prod + [\#11098](https://github.com/vector-im/riot-web/pull/11098) + * add settingDefaults to sample config + [\#9919](https://github.com/vector-im/riot-web/pull/9919) + * Add config.json copy instruction to 'Development' as well + [\#11062](https://github.com/vector-im/riot-web/pull/11062) + * Revert "Run yarn upgrade" + [\#11055](https://github.com/vector-im/riot-web/pull/11055) + * Run yarn upgrade + [\#11050](https://github.com/vector-im/riot-web/pull/11050) + * Request persistent storage on Electron + [\#11052](https://github.com/vector-im/riot-web/pull/11052) + * Remove docs for CIDER feature + [\#11047](https://github.com/vector-im/riot-web/pull/11047) + Changes in [1.4.2](https://github.com/vector-im/riot-web/releases/tag/v1.4.2) (2019-10-04) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.2-rc.1...v1.4.2) From 561d0c9a4ce84fa541fee382ef8da9452665fbe7 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 9 Oct 2019 17:37:00 +0100 Subject: [PATCH 4/8] v1.5.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d54338f6d9..81692f16d0 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.4.2", + "version": "1.5.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e275441701ef1bbb2ec981e84d7f3d7f68c457e2 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 18 Oct 2019 14:54:02 +0100 Subject: [PATCH 5/8] Upgrade to JS SDK v2.4.2 and React SDK v1.7.0 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 20dfce3c88..131e3378e4 100644 --- a/package.json +++ b/package.json @@ -74,8 +74,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.4.2-rc.1", - "matrix-react-sdk": "1.7.0-rc.1", + "matrix-js-sdk": "2.4.2", + "matrix-react-sdk": "1.7.0", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 41870ef39e..7f02639058 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5955,10 +5955,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.4.2-rc.1: - version "2.4.2-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.2-rc.1.tgz#0601c8020e34b6c0ecde6216f86f56664d7a9357" - integrity sha512-s8Bjvw6EkQQshHXC+aM846FJQdXTUIIyh5s+FRpW08yxA3I38/guF9cpJyCD44gZozXr+8c8VFTJ4Af2rRyV7A== +matrix-js-sdk@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.2.tgz#e9c3c929469e0d885463d22f927f7ac38ad5f209" + integrity sha512-DkkUk6IX56Pkz9S7RYLn2XeTRVMrLiFOAavZvzWHs/m+k8JFtjDmJ8JVJLDA12+kL9h6rXYDN80/99RfFZH3hA== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5979,10 +5979,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.7.0-rc.1: - version "1.7.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.0-rc.1.tgz#d58f4897269b9f64d29dc4a0ddf6b29a2dfbc666" - integrity sha512-Nsfstdz9KVfA4U6Aj0TVFuxLeQ4DbbG5+OlPjFU1tw+EM1LRcjecOWxiX1RPiHhQOTiEZbojMVp7tePo2NJaKw== +matrix-react-sdk@1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.0.tgz#122de621da6657cada90119fb40bd8685fe0ea45" + integrity sha512-NrvgA4yujSADHbkg4ZS9xEDzU+riEgQKX7XFNk1XaweZltjkl8WbYte3l3PkEKlB3yFhZ8i232eCz5RosVDDjA== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6013,7 +6013,7 @@ matrix-react-sdk@1.7.0-rc.1: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "4.2" - matrix-js-sdk "2.4.2-rc.1" + matrix-js-sdk "2.4.2" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 6d32d0b322bdf24e733a36a5f97bde66d2e10404 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 18 Oct 2019 14:55:00 +0100 Subject: [PATCH 6/8] v1.5.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 6409e56251..30012970d7 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.5.0-rc.1", + "version": "1.5.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From fd5bb405607561a4d959b6da6be68da34c57e76b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 18 Oct 2019 14:57:44 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.5.0 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a8aa2aa9e..5a742a16fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +Changes in [1.5.0](https://github.com/vector-im/riot-web/releases/tag/v1.5.0) (2019-10-18) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0-rc.1...v1.5.0) + + * Upgrade to JS SDK v2.4.2 and React SDK v1.7.0 + * Port Windows signing and macOS notarization to release + [\#11158](https://github.com/vector-im/riot-web/pull/11158) + * Sign main Windows executable + [\#11126](https://github.com/vector-im/riot-web/pull/11126) + * Notarise the macOS app + [\#11119](https://github.com/vector-im/riot-web/pull/11119) + Changes in [1.5.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.0-rc.1) (2019-10-09) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.2...v1.5.0-rc.1) From 46b75e8c3c42a186b2479b4ff6c81ca9de0b16e5 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Fri, 18 Oct 2019 14:57:44 +0100 Subject: [PATCH 8/8] v1.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 131e3378e4..fd667dc2d4 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.5.0-rc.1", + "version": "1.5.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {