gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
RiotTranslate 2017-06-06 20:37:25 +00:00
parent f815097ee9 080cbea080
commit c117ceb0b6
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -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) 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) [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.0...v0.10.1)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "src/electron-main.js", "main": "src/electron-main.js",
"version": "0.10.1", "version": "0.10.2",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.", "author": "Vector Creations Ltd.",
"dependencies": { "dependencies": {

4
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "electron_app/src/electron-main.js", "main": "electron_app/src/electron-main.js",
"version": "0.10.1", "version": "0.10.2",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.", "author": "Vector Creations Ltd.",
"repository": { "repository": {
@ -66,7 +66,7 @@
"highlight.js": "^9.0.0", "highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3", "linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.7.10", "matrix-js-sdk": "0.7.10",
"matrix-react-sdk": "0.9.1", "matrix-react-sdk": "0.9.2",
"modernizr": "^3.1.0", "modernizr": "^3.1.0",
"pako": "^1.0.5", "pako": "^1.0.5",
"q": "^1.4.1", "q": "^1.4.1",

5
scripts/copy-res.js
View File

@ -12,6 +12,7 @@ const INCLUDE_LANGS = [
{'value': 'en_EN', 'label': 'English'}, {'value': 'en_EN', 'label': 'English'},
{'value': 'en_US', 'label': 'English (US)'}, {'value': 'en_US', 'label': 'English (US)'},
{'value': 'da', 'label': 'Dansk'}, {'value': 'da', 'label': 'Dansk'},
{'value': 'el', 'label': 'Ελληνικά'},
{'value': 'nl', 'label': 'Nederlands'}, {'value': 'nl', 'label': 'Nederlands'},
{'value': 'de_DE', 'label': 'Deutsch'}, {'value': 'de_DE', 'label': 'Deutsch'},
{'value': 'fr', 'label': 'Français'}, {'value': 'fr', 'label': 'Français'},
@ -20,7 +21,9 @@ const INCLUDE_LANGS = [
{'value': 'ru', 'label': 'Русский'}, {'value': 'ru', 'label': 'Русский'},
{'value': 'sv', 'label': 'Svenska'}, {'value': 'sv', 'label': 'Svenska'},
{'value': 'es', 'label': 'Español'}, {'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 // cpx includes globbed parts of the filename in the destination, but excludes

4
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View File

@ -410,6 +410,10 @@ limitations under the License.
top: 7px; top: 7px;
} }
.mx_EventTile_editButton {
top: 3px;
}
.mx_EventTile_readAvatars { .mx_EventTile_readAvatars {
top: 27px; top: 27px;
} }