Commit 8f72ad3d by Johannes Edmeier

fix the damn nodejs build

parent 7733bcf6
......@@ -23,7 +23,6 @@
"no-else-return": 0,
"no-empty": 2,
"no-empty-character-class": 2,
"no-empty-label": 2,
"no-eq-null": 0,
"no-eval": 2,
"no-ex-assign": 2,
......@@ -85,7 +84,6 @@
"no-warning-comments": [0, { "terms": ["todo", "fixme", "xxx"], "location": "start" }],
"no-with": 2,
"yoda": [2, "never"],
"block-scoped-var": 0,
"brace-style": [0, "1tbs"],
"camelcase": 2,
......@@ -116,7 +114,7 @@
"space-after-keywords": [0, "always"],
"space-in-brackets": [0, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"keyword-spacing": 2,
"space-unary-word-ops": 0,
"use-isnan": 2,
"valid-jsdoc": 0,
......
......@@ -27,6 +27,7 @@ module.exports = function ($scope, application) {
return loggers[i];
}
}
return null;
};
$scope.setLogLevel = function (name, level) {
......
......@@ -7,43 +7,43 @@
"test": "./node_modules/gulp/bin/gulp.js"
},
"dependencies": {
"angular": "~1.2.27",
"angular-resource": "~1.2.27",
"angular-route": "~1.2.27",
"angular": "~1.2.28",
"angular-resource": "~1.2.28",
"angular-route": "~1.2.28",
"angular-ui-router": "~0.2.11",
"es5-shim": "^3.0.2",
"es5-shim": "~3.1.0",
"jquery": "~2.1.1",
"js-yaml": "^3.4.2"
"js-yaml": "~3.4.2"
},
"devDependencies": {
"browserify": "^3.44.2",
"chai": "^1.9.1",
"glob": "^4.0.0",
"gulp": "^3.6.2",
"gulp-clean": "^0.2.4",
"gulp-connect": "^2.0.5",
"gulp-eslint": "^0.1.8",
"browserify": "~3.44.2",
"chai": "~1.9.1",
"glob": "~4.0.0",
"gulp": "~3.6.2",
"gulp-clean": "~0.2.4",
"gulp-connect": "~2.0.5",
"gulp-eslint": "~2.0.0",
"gulp-karma": "0.0.4",
"gulp-protractor": "0.0.7",
"gulp-streamify": "0.0.5",
"gulp-uglify": "^0.2.1",
"gulp-uglify": "~0.2.1",
"gulp-mocha": "~2.0.0",
"gulp-shell": "~0.2.10",
"gulp-ng-annotate": "~0.4.0",
"karma": "^0.12.16",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^0.1.4",
"karma-firefox-launcher": "^0.1.3",
"karma-mocha": "^0.1.3",
"karma-sinon": "^1.0.3",
"mocha": "^1.18.2",
"protractor": "^0.22.0",
"sinon": "^1.9.1",
"sinon-chai": "^2.5.0",
"vinyl-source-stream": "^0.1.1",
"karma": "~0.12.16",
"karma-chai": "~0.1.0",
"karma-chrome-launcher": "~0.1.4",
"karma-firefox-launcher": "~0.1.3",
"karma-mocha": "~0.1.3",
"karma-sinon": "~1.0.3",
"mocha": "~1.18.2",
"protractor": "~0.22.0",
"sinon": "~1.9.1",
"sinon-chai": "~2.5.0",
"vinyl-source-stream": "~0.1.1",
"browserify-shim": "~3.8.0",
"proxy-middleware": "~0.7.0",
"angular-mocks": "~1.2.27",
"angular-mocks": "~1.2.28",
"yargs": "~1.3.3"
},
"browser": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment