From 6ada5e5b264e2ebbed91613e99ea20d8ade1e069 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:26:33 +0100 Subject: [PATCH 01/12] react-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 51bc5c4593..15089d57d4 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", - "matrix-react-sdk": "0.12.8", + "matrix-react-sdk": "0.12.9-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 7e3cb3ba31bc9fda0c33a6067717adc604532239 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:27:21 +0100 Subject: [PATCH 02/12] v0.15.7-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 3e84101916..b7996435fa 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", + "version": "0.15.7-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From de713c564f4d89dfea8e1b477c409654ad2fd564 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:28:19 +0100 Subject: [PATCH 03/12] Prepare changelog for v0.15.7-rc.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da133816f1..f3561e4a4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.15.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.1) (2018-07-04) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6...v0.15.7-rc.1) + + * add override for colour of room tile text within memberinfo (unreadable) + [\#6889](https://github.com/vector-im/riot-web/pull/6889) + 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) From 0de36d331ff5f64caa54eec1d02d8b4fdc8a61af Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 4 Jul 2018 11:28:19 +0100 Subject: [PATCH 04/12] v0.15.7-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15089d57d4..6b79bea91c 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", + "version": "0.15.7-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 75e9489db574643fe1927cb2484b6b1735728c26 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 15:58:39 +0100 Subject: [PATCH 05/12] js-sdk rc.1 & react-sdk rc.2 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6b79bea91c..0a68673b21 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", - "matrix-react-sdk": "0.12.9-rc.1", + "matrix-js-sdk": "0.10.6-rc.1", + "matrix-react-sdk": "0.12.9-rc.2", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From d7ebd888049c3e65e228ff0dfb4e6eab4371e2f1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 15:59:20 +0100 Subject: [PATCH 06/12] v0.15.7-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 b7996435fa..4dd12e7e2c 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.7-rc.1", + "version": "0.15.7-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From db3ffd29dacf99d9622dc9b3be36998a139761dc Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 16:01:42 +0100 Subject: [PATCH 07/12] Prepare changelog for v0.15.7-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3561e4a4e..264cff68d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.2) (2018-07-06) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.1...v0.15.7-rc.2) + + * Update react-sdk and js-sdk + Changes in [0.15.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.1) (2018-07-04) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.6...v0.15.7-rc.1) From c36b42af71f9399fed66e67212f26526bbbfba2f Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 6 Jul 2018 16:01:42 +0100 Subject: [PATCH 08/12] v0.15.7-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a68673b21..f553fd8f7b 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.7-rc.1", + "version": "0.15.7-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 73be5005c2f52ce92b22b9b3e876ef4adceaa03c Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:16:42 +0100 Subject: [PATCH 09/12] Released react-sdk & js-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f553fd8f7b..b8ec15732d 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.6-rc.1", - "matrix-react-sdk": "0.12.9-rc.2", + "matrix-js-sdk": "0.10.6", + "matrix-react-sdk": "0.12.9", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 847df2f75b49f717a06bac16f4060c57c7e11aae Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:19:14 +0100 Subject: [PATCH 10/12] v0.15.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 4dd12e7e2c..d236395fd9 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.7-rc.2", + "version": "0.15.7", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From c68623ddb0b2a13736e216e750fbb8975f13a8c8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:20:28 +0100 Subject: [PATCH 11/12] Prepare changelog for v0.15.7 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 264cff68d5..6fa4eddfbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.15.7](https://github.com/vector-im/riot-web/releases/tag/v0.15.7) (2018-07-09) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.2...v0.15.7) + + * No changes since rc.2 + Changes in [0.15.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.7-rc.2) (2018-07-06) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7-rc.1...v0.15.7-rc.2) From 7e03b2503016d5dea3daf52525f0ba490dfe811d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Jul 2018 13:20:29 +0100 Subject: [PATCH 12/12] v0.15.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8ec15732d..e82142f517 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.7-rc.2", + "version": "0.15.7", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {