From d176e83e94c1c7a1240397f77da95a1d8bdad1df Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:34:15 +0000 Subject: [PATCH 1/7] Bump matrix-js-sdk and react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a62109490a..146a5d36c5 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "0.7.5-rc.2", - "matrix-react-sdk": "0.8.6-rc.2", + "matrix-js-sdk": "0.7.5-rc.3", + "matrix-react-sdk": "0.8.6-rc.3", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From e0be012737ccfc8b314a8503c160c77e246c8012 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Feb 2017 13:51:02 +0000 Subject: [PATCH 2/7] Bump olm version Looks like this is causing pickle errors on packaged builds. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 146a5d36c5..f3ded26929 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ "webpack-dev-server": "^1.16.2" }, "optionalDependencies": { - "olm": "https://matrix.org/packages/npm/olm/olm-2.1.0.tgz" + "olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz" }, "build": { "appId": "im.riot.app", From 961f279a822bc18d7a7815c9e539f6500e66c46b Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:44:37 +0000 Subject: [PATCH 3/7] Prepare changelog for v0.9.7-rc.3 --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81b8553a69..7593166c4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [0.9.7-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.3) (2017-02-03) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.2...v0.9.7-rc.3) + * Update to latest Olm to fix key import/export and use of megolm sessions + created on more recent versions + * Update to latest matrix-react-sdk and matrix-js-sdk to fix e2e device + handling + Changes in [0.9.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.2) (2017-02-03) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.1...v0.9.7-rc.2) @@ -5,7 +13,6 @@ Changes in [0.9.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9. * Update matrix-js-sdk to get new device change notifications interface for more reliable e2e crypto - Changes in [0.9.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.1) (2017-02-03) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.6...v0.9.7-rc.1) From dea557619c0d85999447b03fa80e3bb49d979739 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 3 Feb 2017 15:44:37 +0000 Subject: [PATCH 4/7] v0.9.7-rc.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f3ded26929..44d6e67cfd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.7-rc.2", + "version": "0.9.7-rc.3", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { From cd7bc3bfd3d131ef505102e3c89bfab16da1e117 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sat, 4 Feb 2017 10:52:41 +0000 Subject: [PATCH 5/7] Bump to js-sdk 0.7.5 and react-sdk 0.8.6 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 44d6e67cfd..4b0e5d234b 100644 --- a/package.json +++ b/package.json @@ -62,8 +62,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "0.7.5-rc.3", - "matrix-react-sdk": "0.8.6-rc.3", + "matrix-js-sdk": "0.7.5", + "matrix-react-sdk": "0.8.6", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.4.0", From 08cdf21aeedc67ec43b53d369fad34872c9d2308 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sat, 4 Feb 2017 10:55:46 +0000 Subject: [PATCH 6/7] Prepare changelog for v0.9.7 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7593166c4f..659a3742c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.9.7](https://github.com/vector-im/riot-web/releases/tag/v0.9.7) (2017-02-04) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.3...v0.9.7) + + * Update to matrix-js-sdk 0.7.5 (no changes from 0.7.5-rc.3) + * Update to matrix-react-sdk 0.8.6 (no changes from 0.8.6-rc.3) + Changes in [0.9.7-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.3) (2017-02-03) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.2...v0.9.7-rc.3) From dc1a0c554f7a7ec74e95be3d63a58a93c3cc438f Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sat, 4 Feb 2017 10:55:46 +0000 Subject: [PATCH 7/7] v0.9.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b0e5d234b..155523af6c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron/src/electron-main.js", - "version": "0.9.7-rc.3", + "version": "0.9.7", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": {