From f9e7af6e90ada69cd5560d81db9fc7e8059a623d Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:09:01 +0100 Subject: [PATCH 01/12] js & react sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 71f6062cb2..01db87097a 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.4", - "matrix-react-sdk": "0.12.7", + "matrix-js-sdk": "0.10.5-rc.1", + "matrix-react-sdk": "0.12.8-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From f9868b6100d5a5d81fd5fa776a4ef47232431739 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:18:45 +0100 Subject: [PATCH 02/12] v0.15.6-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 910933c151..a0c2180065 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.5", + "version": "0.15.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From f13bf59a82cbe28ec843585edcdace8fa0c98a95 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:20:26 +0100 Subject: [PATCH 03/12] Prepare changelog for v0.15.6-rc.1 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d5e870d9c..de99e7b900 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [0.15.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.1) (2018-06-21) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5...v0.15.6-rc.1) + + * Update from Weblate. + [\#6915](https://github.com/vector-im/riot-web/pull/6915) + * [electron] Fix desktop app --hidden flag + [\#6805](https://github.com/vector-im/riot-web/pull/6805) + Changes in [0.15.5](https://github.com/vector-im/riot-web/releases/tag/v0.15.5) (2018-06-12) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5-rc.1...v0.15.5) From ee6fc5859c1efc4734eeda005473826bdf5056fa Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 21 Jun 2018 10:20:26 +0100 Subject: [PATCH 04/12] v0.15.6-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 01db87097a..9d7e7ee8be 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.5", + "version": "0.15.6-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 79cf34b72e8d582279b2b55a6248f458f73d617e Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:12:41 +0100 Subject: [PATCH 05/12] react-sdk rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d7e7ee8be..d8138a158f 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.5-rc.1", - "matrix-react-sdk": "0.12.8-rc.1", + "matrix-react-sdk": "0.12.8-rc.2", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 62653d39b347f6568d869a2e8dcd6054b91d2b0b Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:13:00 +0100 Subject: [PATCH 06/12] v0.15.6-rc.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 a0c2180065..d71f36f819 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.6-rc.1", + "version": "0.15.6-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 41575382ce72680a93120df79b0a815a2c5e4134 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:15:33 +0100 Subject: [PATCH 07/12] Prepare changelog for v0.15.6-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de99e7b900..733805799b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.2) (2018-06-22) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.1...v0.15.6-rc.2) + + * Update to react-sdk rc.2 for fix to slash commands + Changes in [0.15.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.1) (2018-06-21) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.5...v0.15.6-rc.1) From fb43e49954bb36f6e6277362d505c325569d8a51 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 22 Jun 2018 18:15:34 +0100 Subject: [PATCH 08/12] v0.15.6-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8138a158f..871417d2a1 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.6-rc.1", + "version": "0.15.6-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From e193b65bc7583a187eb93cdccbccbaa37e2410c1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 11:54:01 +0100 Subject: [PATCH 09/12] Released js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 871417d2a1..8f4fca701b 100644 --- a/package.json +++ b/package.json @@ -64,8 +64,8 @@ "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", - "matrix-js-sdk": "0.10.5-rc.1", - "matrix-react-sdk": "0.12.8-rc.2", + "matrix-js-sdk": "0.10.5", + "matrix-react-sdk": "0.12.8", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 3126bf6561dbede3af154ba84f41a898b8e0dd8f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 11:56:19 +0100 Subject: [PATCH 10/12] Prepare changelog for v0.15.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 733805799b..da133816f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.6) (2018-06-29) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.2...v0.15.6) + + * Pull in bug fixes from react-sdk + Changes in [0.15.6-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.6-rc.2) (2018-06-22) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6-rc.1...v0.15.6-rc.2) From 84fbee085de5786a855373530cd3a7e86bc3a0a3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 12:01:17 +0100 Subject: [PATCH 11/12] v0.15.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 d71f36f819..3e84101916 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.6-rc.2", + "version": "0.15.6", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 768e206c4a7c46451217876d7c4e29b714445453 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 29 Jun 2018 12:02:51 +0100 Subject: [PATCH 12/12] v0.15.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8f4fca701b..7f2c1510ee 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.6-rc.2", + "version": "0.15.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {