From 13c780c7c5e36e1c2d7e2be49468a2cde8565119 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 6 Jun 2017 16:51:00 +0100 Subject: [PATCH 1/8] add traditional chinese, thai, greek --- scripts/copy-res.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 2311b90075..5ed01068af 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -12,6 +12,7 @@ const INCLUDE_LANGS = [ {'value': 'en_EN', 'label': 'English'}, {'value': 'en_US', 'label': 'English (US)'}, {'value': 'da', 'label': 'Dansk'}, + {'value': 'el', 'label': 'Ελληνικά'}, {'value': 'nl', 'label': 'Nederlands'}, {'value': 'de_DE', 'label': 'Deutsch'}, {'value': 'fr', 'label': 'Français'}, @@ -20,7 +21,9 @@ const INCLUDE_LANGS = [ {'value': 'ru', 'label': 'Русский'}, {'value': 'sv', 'label': 'Svenska'}, {'value': 'es', 'label': 'Español'}, - {'value': 'zh_Hans', 'label': '中文'} + {'value': 'th', 'label': 'Thai'}, + {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese + {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese ]; // cpx includes globbed parts of the filename in the destination, but excludes From 383f6b619bfa16b9ceb9455c0b91a4bdda3b5ff2 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Tue, 6 Jun 2017 12:11:02 -0400 Subject: [PATCH 2/8] adjust alignment of message menu button --- .../vector/css/matrix-react-sdk/views/rooms/_EventTile.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss index 5542d18d0c..7d517804bc 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss @@ -410,6 +410,10 @@ limitations under the License. top: 7px; } + .mx_EventTile_editButton { + top: 3px; + } + .mx_EventTile_readAvatars { top: 27px; } From a62ed0eb03b58f351e2e7b97a766701b95d64228 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 6 Jun 2017 17:41:26 +0100 Subject: [PATCH 3/8] reatc-sdk 0.9.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff2b413e93..2709587cdb 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "highlight.js": "^9.0.0", "linkifyjs": "^2.1.3", "matrix-js-sdk": "0.7.10", - "matrix-react-sdk": "0.9.1", + "matrix-react-sdk": "0.9.2", "modernizr": "^3.1.0", "pako": "^1.0.5", "q": "^1.4.1", From d648dc867e4451c49e60b21eedc634812204981a Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 6 Jun 2017 17:41:57 +0100 Subject: [PATCH 4/8] v0.10.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 b3e6d74fcc..89e3e4f50f 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.1", + "version": "0.10.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 3d51156b7e923d15bf72f52d9970977fbf8058b5 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 6 Jun 2017 17:43:34 +0100 Subject: [PATCH 5/8] Temporarily revert --- 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 89e3e4f50f..b3e6d74fcc 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.2", + "version": "0.10.1", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 951b63898b3a276c53da89c68594749f56e5b82c Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 6 Jun 2017 17:43:57 +0100 Subject: [PATCH 6/8] v0.10.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 b3e6d74fcc..89e3e4f50f 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.1", + "version": "0.10.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "dependencies": { From 88e159e46249d8112cfffe3f41de51b1319dfb5d Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 6 Jun 2017 17:45:06 +0100 Subject: [PATCH 7/8] Prepare changelog for v0.10.2 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41b0970134..ae8209ad12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [0.10.2](https://github.com/vector-im/riot-web/releases/tag/v0.10.2) (2017-06-06) +============================================================================================ +[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.1...v0.10.2) + + * Hotfix for bugs where navigating straight to a URL like /#/login and + and /#/forgot_password + + 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) From 26bb962a3c179a8587cdfc8b0257ad712793d654 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 6 Jun 2017 17:45:07 +0100 Subject: [PATCH 8/8] v0.10.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2709587cdb..7a665ba987 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.1", + "version": "0.10.2", "description": "A feature-rich client for Matrix.org", "author": "Vector Creations Ltd.", "repository": {