Merge pull request #405 from yuya-oc/update-dependencies

Update dependencies

Close #397
This commit is contained in:
Yuya Ochiai
2016-12-27 21:17:09 +09:00
committed by GitHub
6 changed files with 54 additions and 39 deletions

View File

@@ -93,11 +93,7 @@ const MattermostView = React.createClass({
});
}
osLocale((err, locale) => {
if (err) {
console.log(err);
return;
}
osLocale().then((locale) => {
if (locale === 'ja_JP') {
applyCssFile(__dirname + '/css/jp_fonts.css');
}

View File

@@ -12,18 +12,18 @@
"homepage": "https://about.mattermost.com",
"license": "Apache-2.0",
"devDependencies": {
"electron-connect": "~0.6.0"
"electron-connect": "^0.6.1"
},
"dependencies": {
"auto-launch": "^5.0.1",
"bootstrap": "^3.3.7",
"electron-context-menu": "^0.6.0",
"electron-context-menu": "^0.8.0",
"electron-squirrel-startup": "^1.0.0",
"os-locale": "^1.4.0",
"react": "^15.3.0",
"react-addons-css-transition-group": "^15.3.0",
"react-bootstrap": "~0.30.6",
"react-dom": "^15.3.0",
"os-locale": "^2.0.0",
"react": "^15.4.1",
"react-addons-css-transition-group": "^15.4.1",
"react-bootstrap": "~0.30.7",
"react-dom": "^15.4.1",
"yargs": "^3.32.0"
}
}