From b6da3146927d1c2c64f6ebcafe29da4766b35877 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Apr 2019 16:15:05 +0200 Subject: [PATCH 1/4] bump js-sdk to 1.0.4 and react-sdk to 1.0.7 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 630edfd663..310ce57ac3 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.3", - "matrix-react-sdk": "1.0.6", + "matrix-js-sdk": "1.0.4", + "matrix-react-sdk": "1.0.7", "modernizr": "^3.6.0", "olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz", "prop-types": "^15.6.2", From 659c29cf779f40fe60bda36d94174e9eed054dfa Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Apr 2019 16:16:46 +0200 Subject: [PATCH 2/4] v1.0.7 --- 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 c51a7abb71..ee6a40e586 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.6", + "version": "1.0.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 44258ffa4b9ca01f1cfdbbe7d40e0ddd8d591147 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Apr 2019 16:18:21 +0200 Subject: [PATCH 3/4] Prepare changelog for v1.0.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a4cf98b2..ba13e505c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.0.7](https://github.com/vector-im/riot-web/releases/tag/v1.0.7) (2019-04-08) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6...v1.0.7) + + * Hotfix: bump js-sdk to 1.0.4, see https://github.com/matrix-org/matrix-js-sdk/releases/tag/v1.0.4 + Changes in [1.0.6](https://github.com/vector-im/riot-web/releases/tag/v1.0.6) (2019-04-01) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6-rc.1...v1.0.6) From f76b30af15b60f90a35d7c273fe868209e906a83 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 8 Apr 2019 16:18:22 +0200 Subject: [PATCH 4/4] v1.0.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 310ce57ac3..eed4fd2c94 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.6", + "version": "1.0.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {