From b90017ff15dfcf1d2baef0ebf39536206fc9ced4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 17 May 2018 17:06:24 +0100 Subject: [PATCH 1/4] react-sdk v0.12.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 431e6e8c..ba855245 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "matrix-js-sdk": "0.10.2", - "matrix-react-sdk": "0.12.4", + "matrix-react-sdk": "0.12.5", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 3598df0d28e4b4d2fd02054ac8db9a70b0c50fc4 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 17 May 2018 17:07:50 +0100 Subject: [PATCH 2/4] v0.15.2 --- 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 20688707..855c4f5c 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.15.1", + "version": "0.15.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From d606ad99b774f6d6d8987b110bf685aed0ec2c82 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 17 May 2018 17:10:17 +0100 Subject: [PATCH 3/4] Prepare changelog for v0.15.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41c54aef..f076b760 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.2) (2018-05-17) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.1...v0.15.2) + + * Update to matrix-react-sdk v0.12.5 to fix image size jumps + Changes in [0.15.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.1) (2018-05-16) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0...v0.15.1) From b128431128ed89b2c2bbf97e068d3b1cfec93540 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 17 May 2018 17:10:17 +0100 Subject: [PATCH 4/4] v0.15.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba855245..38cbe850 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.15.1", + "version": "0.15.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {