diff --git a/CHANGELOG.md b/CHANGELOG.md index fe3fb26cd0b..41b09701342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [0.10.1](https://github.com/vector-im/riot-web/releases/tag/v0.10.1) (2017-06-02) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.0...v0.10.1) + + * Update to matrix-react-sdk 0.9.1 to fix i18n error which broke start chat in some circumstances + Changes in [0.10.0](https://github.com/vector-im/riot-web/releases/tag/v0.10.0) (2017-06-02) ============================================================================================ [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.0-rc.2...v0.10.0) diff --git a/electron_app/package.json b/electron_app/package.json index 096c1e96ef1..b3e6d74fcce 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.10.0", + "version": "0.10.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { diff --git a/package.json b/package.json index 73ebc009503..ff2b413e937 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.10.0", + "version": "0.10.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": { @@ -66,7 +66,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", "matrix-js-sdk": "0.7.10", - "matrix-react-sdk": "0.9.0", + "matrix-react-sdk": "0.9.1", "modernizr": "^3.1.0", "pako": "^1.0.5", "q": "^1.4.1", diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 460b2b51893..9c0e97d50e3 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -17,6 +17,7 @@ const INCLUDE_LANGS = [ {'value': 'pt', 'label': 'Português'}, {'value': 'pt_BR', 'label': 'Português do Brasil'}, {'value': 'ru', 'label': 'Русский'}, + {'value': 'sv', 'label': 'Svenska'}, {'value': 'es', 'label': 'Español'}, {'value': 'zh_Hans', 'label': '中文'} ]; diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss index 94820549e7d..805c817a28d 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss @@ -178,6 +178,7 @@ limitations under the License. display: inline-block; min-width: 170px; align-self: flex-end; + flex: 1 1 auto; } .mx_Login_field_group {