Commit e80d355b22523561926d024097ebe8e786d894fd
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
2 changed files
with
3 additions
and
2 deletions
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | ], | 11 | ], |
| 12 | "scripts": { | 12 | "scripts": { |
| 13 | "start": "babel-node --max_old_space_size=4096 server.js", | 13 | "start": "babel-node --max_old_space_size=4096 server.js", |
| 14 | - "build": "NODE_ENV=production webpack -p" | 14 | + "build": "cross-env NODE_ENV=production webpack -p" |
| 15 | }, | 15 | }, |
| 16 | "dependencies": { | 16 | "dependencies": { |
| 17 | "@flowjs/ng-flow": "^2.7.1", | 17 | "@flowjs/ng-flow": "^2.7.1", |
| @@ -89,6 +89,7 @@ | @@ -89,6 +89,7 @@ | ||
| 89 | "babel-preset-react": "^6.16.0", | 89 | "babel-preset-react": "^6.16.0", |
| 90 | "connect-history-api-fallback": "^1.3.0", | 90 | "connect-history-api-fallback": "^1.3.0", |
| 91 | "copy-webpack-plugin": "^3.0.1", | 91 | "copy-webpack-plugin": "^3.0.1", |
| 92 | + "cross-env": "^3.2.4", | ||
| 92 | "css-loader": "^0.25.0", | 93 | "css-loader": "^0.25.0", |
| 93 | "eslint": "^3.4.0", | 94 | "eslint": "^3.4.0", |
| 94 | "eslint-config-angular": "^0.5.0", | 95 | "eslint-config-angular": "^0.5.0", |
| @@ -693,7 +693,7 @@ export default angular.module('thingsboard.locale', []) | @@ -693,7 +693,7 @@ export default angular.module('thingsboard.locale', []) | ||
| 693 | "title-required": "Widget title is required.", | 693 | "title-required": "Widget title is required.", |
| 694 | "type": "Widget type", | 694 | "type": "Widget type", |
| 695 | "resources": "Resources", | 695 | "resources": "Resources", |
| 696 | - "resource-url": "JavaScript/CSS URI", | 696 | + "resource-url": "JavaScript/CSS URL", |
| 697 | "remove-resource": "Remove resource", | 697 | "remove-resource": "Remove resource", |
| 698 | "add-resource": "Add resource", | 698 | "add-resource": "Add resource", |
| 699 | "html": "HTML", | 699 | "html": "HTML", |