dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Igor Kulikov 2017-03-16 13:13:48 +02:00
commit e80d355b22
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/package.json
View File

@ -11,7 +11,7 @@
], ],
"scripts": { "scripts": {
"start": "babel-node --max_old_space_size=4096 server.js", "start": "babel-node --max_old_space_size=4096 server.js",
"build": "NODE_ENV=production webpack -p" "build": "cross-env NODE_ENV=production webpack -p"
}, },
"dependencies": { "dependencies": {
"@flowjs/ng-flow": "^2.7.1", "@flowjs/ng-flow": "^2.7.1",
@ -89,6 +89,7 @@
"babel-preset-react": "^6.16.0", "babel-preset-react": "^6.16.0",
"connect-history-api-fallback": "^1.3.0", "connect-history-api-fallback": "^1.3.0",
"copy-webpack-plugin": "^3.0.1", "copy-webpack-plugin": "^3.0.1",
"cross-env": "^3.2.4",
"css-loader": "^0.25.0", "css-loader": "^0.25.0",
"eslint": "^3.4.0", "eslint": "^3.4.0",
"eslint-config-angular": "^0.5.0", "eslint-config-angular": "^0.5.0",

2
ui/src/app/locale/locale.constant.js
View File

@ -693,7 +693,7 @@ export default angular.module('thingsboard.locale', [])
"title-required": "Widget title is required.", "title-required": "Widget title is required.",
"type": "Widget type", "type": "Widget type",
"resources": "Resources", "resources": "Resources",
"resource-url": "JavaScript/CSS URI", "resource-url": "JavaScript/CSS URL",
"remove-resource": "Remove resource", "remove-resource": "Remove resource",
"add-resource": "Add resource", "add-resource": "Add resource",
"html": "HTML", "html": "HTML",