diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f94f797a4..94ad460289 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,34 @@ +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) + + * 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) + + * 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) + + * 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) 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" } diff --git a/package.json b/package.json index c2400cedfc..5218be1a1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vector-web", - "version": "0.6.1", + "version": "0.7.3", "description": "Vector webapp", "author": "matrix.org", "repository": { @@ -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.4", + "matrix-react-sdk": "^0.6.3", "modernizr": "^3.1.0", "q": "^1.4.1", "react": "^15.0.1", 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; 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; +} 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;