From 96b624e941ec521aedf1c3b047f44692adb018fb Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 18:33:04 +0100 Subject: [PATCH 01/15] js-sdk & react-sdk rc.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index da0141894..e97a6c260 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", - "matrix-react-sdk": "0.12.9", + "matrix-js-sdk": "0.10.7-rc.1", + "matrix-react-sdk": "0.13.0-rc.1", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From ea00df0466cd9308f235a9379deed1aa304f9b02 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 18:33:53 +0100 Subject: [PATCH 02/15] v0.16.0-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 d236395fd..87ad60ead 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", + "version": "0.16.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From ed90c491e24b56da2883933f812d80a53bdc1edd Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 18:35:01 +0100 Subject: [PATCH 03/15] Prepare changelog for v0.16.0-rc.1 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa4eddfb..4cecf7cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +Changes in [0.16.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.1) (2018-07-24) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7...v0.16.0-rc.1) + + * Update from Weblate. + [\#7082](https://github.com/vector-im/riot-web/pull/7082) + * Sample config for jitsi integration URL + [\#7055](https://github.com/vector-im/riot-web/pull/7055) + 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) From f5a257ca79964fecfdc5293f0c7389d377192996 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 18:35:02 +0100 Subject: [PATCH 04/15] v0.16.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e97a6c260..e2229d8eb 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", + "version": "0.16.0-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 8e5b67d7c9abe09e8f201979f19ae3f3c2f1cbf1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 19:40:31 +0100 Subject: [PATCH 05/15] react-sdk rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2229d8eb..baa7bc3b4 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.7-rc.1", - "matrix-react-sdk": "0.13.0-rc.1", + "matrix-react-sdk": "0.13.0-rc.2", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From f248da3e08178827f8c1f998541d94fce09fb4bf Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 19:40:52 +0100 Subject: [PATCH 06/15] v0.16.0-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 87ad60ead..ed0ef53db 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.16.0-rc.1", + "version": "0.16.0-rc.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 5d2bf37ac92515152d1515236cc20ad79ceb2557 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 19:42:10 +0100 Subject: [PATCH 07/15] Prepare changelog for v0.16.0-rc.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cecf7cf0..80a1afe56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.16.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.2) (2018-07-24) +====================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.1...v0.16.0-rc.2) + + * Update to react-sdk rc.2 to remove Jitsi conference calling from labs + Changes in [0.16.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.1) (2018-07-24) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.7...v0.16.0-rc.1) From 8bd832b44967194ef6c77b0c28ac8a6387a42d9f Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 24 Jul 2018 19:42:11 +0100 Subject: [PATCH 08/15] v0.16.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index baa7bc3b4..4c0ef3b1a 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.16.0-rc.1", + "version": "0.16.0-rc.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 88745a9f3635f7b7c36fc59c669d87458f38248a Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Jul 2018 12:13:29 +0100 Subject: [PATCH 09/15] Released js-sdk & react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4c0ef3b1a..4d40a4cb8 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.7-rc.1", - "matrix-react-sdk": "0.13.0-rc.2", + "matrix-js-sdk": "0.10.7", + "matrix-react-sdk": "0.13.0", "modernizr": "^3.1.0", "prop-types": "^15.5.10", "react": "^15.6.0", From 6e0aeeea8350a7624b660e0a6eac3c31be8958e7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Jul 2018 12:14:55 +0100 Subject: [PATCH 10/15] v0.16.0 --- 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 ed0ef53db..c006db74f 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.16.0-rc.2", + "version": "0.16.0", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 31c4cf968b564712612ae703e2e0486e4c51fa5e Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Jul 2018 12:19:27 +0100 Subject: [PATCH 11/15] Prepare changelog for v0.16.0 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a1afe56..26b59586f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.16.0](https://github.com/vector-im/riot-web/releases/tag/v0.16.0) (2018-07-30) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.2...v0.16.0) + +* Update react-sdk version for bugfixes with Jitsi widgets and the new composer + Changes in [0.16.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.0-rc.2) (2018-07-24) ====================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.0-rc.1...v0.16.0-rc.2) From 764797e211ceda9d73f227412328859b5833885f Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 30 Jul 2018 12:19:27 +0100 Subject: [PATCH 12/15] v0.16.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d40a4cb8..6c635bff5 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.16.0-rc.2", + "version": "0.16.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 8a18488b1e3aece694fecdbc6255b68148f54730 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Aug 2018 11:00:35 +0100 Subject: [PATCH 13/15] Pin sanitize-html to 0.18.2 Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241 / https://github.com/punkave/sanitize-html/issues/242 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6c635bff5..5506fe857 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "prop-types": "^15.5.10", "react": "^15.6.0", "react-dom": "^15.6.0", - "sanitize-html": "^1.11.1", + "sanitize-html": "1.18.2", "ua-parser-js": "^0.7.10", "url": "^0.11.0" }, From a79e9b4fd61247bb9960748b62d366466ac94440 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Aug 2018 16:22:07 +0100 Subject: [PATCH 14/15] Unpin sanitize-html 1.18.4 is now out which makes it work with webpack again --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5506fe857..7414938da 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "prop-types": "^15.5.10", "react": "^15.6.0", "react-dom": "^15.6.0", - "sanitize-html": "1.18.2", + "sanitize-html": "^1.18.4", "ua-parser-js": "^0.7.10", "url": "^0.11.0" }, From 65e690bad71cf93c68207d5119afadb96e447778 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 3 Aug 2018 15:02:25 +0100 Subject: [PATCH 15/15] CSS for user limit error See https://github.com/matrix-org/matrix-react-sdk/pull/2108 --- res/themes/status/css/_status.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss index 7e97bb488..5b5a264de 100644 --- a/res/themes/status/css/_status.scss +++ b/res/themes/status/css/_status.scss @@ -76,6 +76,7 @@ $focus-brightness: 125%; // red warning colour $warning-color: #F69E98; +$warning-bg-color: #DF2A8B; $mention-user-pill-bg-color: #ff0064; $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);