From aaff9133c7cad606bfad129aa38afe5796dd0bed Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 21:49:43 +0100 Subject: [PATCH 1/4] Newer js-sdk & react-sdk for js-sdk build fix --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 44839aad56..4e9bb9324f 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", - "matrix-js-sdk": "0.8.3", - "matrix-react-sdk": "0.10.5", + "matrix-js-sdk": "0.8.4", + "matrix-react-sdk": "0.10.6", "modernizr": "^3.1.0", "pako": "^1.0.5", "prop-types": "^15.5.10", From af3feccc2dbbfe23d890999d2af764ec8fee8041 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 21:50:48 +0100 Subject: [PATCH 2/4] v0.12.6 --- 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 3ab6a6e998..4d1776903a 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.12.5", + "version": "0.12.6", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From b25075974c9be8d01d9edbbb123ed7588f4bd027 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 21:53:09 +0100 Subject: [PATCH 3/4] Prepare changelog for v0.12.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb358856a0..d307764497 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.12.6](https://github.com/vector-im/riot-web/releases/tag/v0.12.6) (2017-09-21) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.5...v0.12.6) + + * Use matrix-js-sdk v0.8.4 to fix build + Changes in [0.12.5](https://github.com/vector-im/riot-web/releases/tag/v0.12.5) (2017-09-21) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4...v0.12.5) From 2b7ee756f8945c933050b6c3a451340241c9bab2 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Sep 2017 21:53:09 +0100 Subject: [PATCH 4/4] v0.12.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e9bb9324f..7d59480222 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.12.5", + "version": "0.12.6", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": {