From d70842c3c70bd85de09d786d822106630226b967 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 20 May 2016 12:21:45 +0100 Subject: [PATCH 01/18] fix padding of badges --- src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css index 45a997c33a..a8eead8669 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css @@ -103,7 +103,7 @@ limitations under the License. N.B. this has to come after the above _selected width tweaks */ .mx_RoomTile_unreadNotify .mx_RoomTile_name, .mx_RoomTile_highlight .mx_RoomTile_name { - padding-right: 36px; + padding-right: 40px; } .mx_RoomTile_selected .mx_RoomTile_name span { From bede9a814bdaaea6902222a2c50f3581e84e1fd8 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 24 May 2016 00:30:36 +0100 Subject: [PATCH 02/18] remove spurious top border; fix #1472 --- src/skins/vector/css/vector-web/structures/RoomDirectory.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/skins/vector/css/vector-web/structures/RoomDirectory.css b/src/skins/vector/css/vector-web/structures/RoomDirectory.css index c745706be4..2f75724d54 100644 --- a/src/skins/vector/css/vector-web/structures/RoomDirectory.css +++ b/src/skins/vector/css/vector-web/structures/RoomDirectory.css @@ -22,8 +22,6 @@ limitations under the License. margin-bottom: 12px; color: #4a4a4a; - border-top: 1px solid #c5c5c5; - display: -webkit-box; display: -moz-box; display: -ms-flexbox; From 12157edd624ea2287b3442b576848d4c386966d6 Mon Sep 17 00:00:00 2001 From: Aviral Dasgupta Date: Sat, 28 May 2016 12:20:21 +0530 Subject: [PATCH 03/18] Style selection color --- src/skins/vector/css/common.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css index f179a20f6c..c22a7def04 100644 --- a/src/skins/vector/css/common.css +++ b/src/skins/vector/css/common.css @@ -228,3 +228,13 @@ input[type=text]:focus, textarea:focus { height: 1em; vertical-align: middle; } + +::-moz-selection { + background-color: #76CFA6; + color: white; +} + +::selection { + background-color: #76CFA6; + color: white; +} From 1902b631c75a8b144517c82023d8d024aa106f0d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 11:45:23 +0100 Subject: [PATCH 04/18] add default branding parameter for email notifs --- config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.json b/config.json index e1024d0b7e..e69cf06cf5 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,7 @@ { "default_hs_url": "https://matrix.org", "default_is_url": "https://vector.im", + "brand": "Vector", "integrations_ui_url": "http://localhost:8081/", "integrations_rest_url": "http://localhost:5050" } From d976046e6ad83eff51562168d0da92eebb715ca4 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 13:15:13 +0100 Subject: [PATCH 05/18] set email branding whenever emails are added from vector --- config.json | 4 ++-- src/components/views/settings/Notifications.js | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config.json b/config.json index e69cf06cf5..7a86618939 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { - "default_hs_url": "https://matrix.org", + "default_hs_url": "http://127.0.0.1:8008", "default_is_url": "https://vector.im", "brand": "Vector", - "integrations_ui_url": "http://localhost:8081/", + "integrations_ui_url": "http://localhost:5051/", "integrations_rest_url": "http://localhost:5050" } diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js index a9ff9c0e5a..8b283191ed 100644 --- a/src/components/views/settings/Notifications.js +++ b/src/components/views/settings/Notifications.js @@ -21,6 +21,7 @@ var sdk = require('matrix-react-sdk'); var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); var UserSettingsStore = require('matrix-react-sdk/lib/UserSettingsStore'); var Modal = require('matrix-react-sdk/lib/Modal'); +var configJson = require("../../../../config.json"); var notifications = require('../../../notifications'); @@ -116,7 +117,11 @@ module.exports = React.createClass({ onEnableEmailNotificationsChange: function(address, event) { var emailPusherPromise; if (event.target.checked) { - emailPusherPromise = UserSettingsStore.addEmailPusher(address); + var data = {} + if (configJson.brand) { + data['brand'] = configJson.brand; + } + emailPusherPromise = UserSettingsStore.addEmailPusher(address, data); } else { var emailPusher = UserSettingsStore.getEmailPusher(this.state.pushers, address); emailPusher.kind = null; From f6ec858ac9f524dd36d11c58015841cd47ec956e Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 2 Jun 2016 13:39:52 +0100 Subject: [PATCH 06/18] Bump js-sdk and react-sdk for new releases js-sdk 0.5.3 react-sdk 0.6.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c2400cedfc..ef0e2bb54e 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.0.0-beta.4", - "matrix-js-sdk": "^0.5.2", - "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop", + "matrix-js-sdk": "^0.5.3", + "matrix-react-sdk": "^0.6.0", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.0.1", From a53acb3b58391700cfd7ef4a0eb3a538365b3738 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 2 Jun 2016 13:42:24 +0100 Subject: [PATCH 07/18] Prepare changelog for v0.7.0 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f94f797a4..435bb491e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +Changes in [0.7.0](https://github.com/vector-im/vector-web/releases/tag/v0.7.0) (2016-06-02) +============================================================================================ +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.6.1...v0.7.0) + + * Update to matrix-react-sdk 0.6.0 - see + [changelog](https://github.com/matrix-org/matrix-react-sdk/blob/v0.6.0/CHANGELOG.md) + * Style selection color. + [\#1557](https://github.com/vector-im/vector-web/pull/1557) + * Fix NPE when loading the Settings page which infini-spinnered + [\#1518](https://github.com/vector-im/vector-web/pull/1518) + * Add option to enable email notifications + [\#1469](https://github.com/vector-im/vector-web/pull/1469) + Changes in [0.6.1](https://github.com/vector-im/vector-web/releases/tag/v0.6.1) (2016-04-22) ============================================================================================ [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.6.0...v0.6.1) From e0bf23fa7cc00d488a4f85c33c9d4fa0a6183e41 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Thu, 2 Jun 2016 13:42:25 +0100 Subject: [PATCH 08/18] 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ef0e2bb54e..7c1b2b7658 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.6.1", + "version": "0.7.0", "description": "Vector webapp", "author": "matrix.org", "repository": { From cadedd29191f2a8f6c4d11039e5148b1efcf7d77 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Jun 2016 14:24:36 +0100 Subject: [PATCH 09/18] Revert presumably accidentally comitted config.json --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 7a86618939..e69cf06cf5 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { - "default_hs_url": "http://127.0.0.1:8008", + "default_hs_url": "https://matrix.org", "default_is_url": "https://vector.im", "brand": "Vector", - "integrations_ui_url": "http://localhost:5051/", + "integrations_ui_url": "http://localhost:8081/", "integrations_rest_url": "http://localhost:5050" } From 481a7b160d4dd79e014f15ba906676e5e2ab36e9 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 18:41:20 +0100 Subject: [PATCH 10/18] Prepare changelog for v0.7.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 435bb491e7..2e7b904643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.7.1](https://github.com/vector-im/vector-web/releases/tag/v0.7.1) (2016-06-02) +============================================================================================ +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.0...v0.7.1) + + * Fix accidentally committed local changes to the default config.json (doh!) + Changes in [0.7.0](https://github.com/vector-im/vector-web/releases/tag/v0.7.0) (2016-06-02) ============================================================================================ [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.6.1...v0.7.0) From 635fd927cd185a567df6997bb3fe32f4719b9318 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 18:41:20 +0100 Subject: [PATCH 11/18] 0.7.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7c1b2b7658..f0552dc5f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.7.0", + "version": "0.7.1", "description": "Vector webapp", "author": "matrix.org", "repository": { From 4ec77eeca704d1ebd97cc0bc438671d86e4b589c Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 19:04:22 +0100 Subject: [PATCH 12/18] correctly bump dep on js-sdk and react-sdk --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f0552dc5f9..48155c81cc 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "gfm.css": "^1.1.1", "highlight.js": "^9.0.0", "linkifyjs": "^2.0.0-beta.4", - "matrix-js-sdk": "^0.5.3", - "matrix-react-sdk": "^0.6.0", + "matrix-js-sdk": "^0.5.4", + "matrix-react-sdk": "^0.6.2", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.0.1", From 1a11c402fa37647de49004da435019f9e5897208 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 19:05:50 +0100 Subject: [PATCH 13/18] Prepare changelog for v0.7.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e7b904643..7df8eb8083 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.7.2](https://github.com/vector-im/vector-web/releases/tag/v0.7.2) (2016-06-02) +============================================================================================ +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.1...v0.7.2) + + * Correctly bump the dep on new matrix-js-sdk and matrix-react-sdk + Changes in [0.7.1](https://github.com/vector-im/vector-web/releases/tag/v0.7.1) (2016-06-02) ============================================================================================ [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.0...v0.7.1) From ded66bbdfc3ad02afc529d6f6b6228a374e87193 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 19:05:50 +0100 Subject: [PATCH 14/18] 0.7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 48155c81cc..c88edd6eba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.7.1", + "version": "0.7.2", "description": "Vector webapp", "author": "matrix.org", "repository": { From ddc4ac187c1daafe90608da4e8d03d9319460985 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Thu, 2 Jun 2016 23:32:47 +0100 Subject: [PATCH 15/18] dep on react-sdk develop --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c88edd6eba..9edf390f4f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.0.0-beta.4", "matrix-js-sdk": "^0.5.4", - "matrix-react-sdk": "^0.6.2", + "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.0.1", From e68a2b5e1db796bf3aa69d5af744c8863320aef3 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 3 Jun 2016 12:19:04 +0100 Subject: [PATCH 16/18] pin to react sdk 0.6.3 for release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9edf390f4f..9311ec1065 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.0.0-beta.4", "matrix-js-sdk": "^0.5.4", - "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "^0.6.3", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.0.1", From 7ab2449ac18263c528082a8f35fea2ba803964a8 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 3 Jun 2016 12:20:04 +0100 Subject: [PATCH 17/18] Prepare changelog for v0.7.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7df8eb8083..94ad460289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.7.3](https://github.com/vector-im/vector-web/releases/tag/v0.7.3) (2016-06-03) +============================================================================================ +[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.2...v0.7.3) + +* Update to react-sdk 0.6.3 + Changes in [0.7.2](https://github.com/vector-im/vector-web/releases/tag/v0.7.2) (2016-06-02) ============================================================================================ [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.1...v0.7.2) From c672919d1e869004d2e9df0adecc328e99930624 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 3 Jun 2016 12:20:05 +0100 Subject: [PATCH 18/18] 0.7.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9311ec1065..5218be1a1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.7.2", + "version": "0.7.3", "description": "Vector webapp", "author": "matrix.org", "repository": {