diff --git a/bower.json b/bower.json index 126041e1..8827fcae 100644 --- a/bower.json +++ b/bower.json @@ -8,12 +8,12 @@ "angular-sanitize": "1.4.3", "angular-animate": "1.4.3", "angular-touch": "1.4.3", - "lodash": "~3.10.0", + "lodash": "~3.10.1", "oboe": "~2.1.2", - "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a", - "angular-gettext": "git://github.com/rubenv/angular-gettext.git#6bf6a66d8b4fd6c5e0fddcee050991391977cf87", + "ng-table": "~0.8.1", + "angular-gettext": "~2.1.0", "angular-ui-ace": "~0.2.3", - "angular-bootstrap": "~0.12.1", + "angular-bootstrap": "~0.13.2", "angular-dialog-service": "~5.2.6", "ng-file-upload": "~2.0.5", "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3", @@ -25,7 +25,7 @@ "angular-elastic": "~2.5.0", "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.5", "angular-borderlayout": "git://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67", - "angular-ui-bootstrap": "~0.12.1", + "angular-ui-bootstrap": "~0.13.2", "ng-context-menu": "~1.0.1", "components-font-awesome": "~4.4.0", "epoch": "~0.6.0", @@ -42,6 +42,7 @@ "resolutions": { "angular": "1.4.3", "d3": "~3.5.5", - "spin.js": "~2.3.2" + "spin.js": "~2.3.2", + "angular-bootstrap": "~0.13.2" } } diff --git a/package.json b/package.json index 7050e798..2743a44d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "csurf": "^1.7.0", "eventemitter3": "^0.1.6", "express": "^4.13.3", - "express-validator": "^2.8.0", + "express-validator": "^2.14.0", "formidable": "^1.0.17", "gm": "^1.17.0", "hipchatter": "^0.2.0", @@ -51,7 +51,7 @@ "jade": "^1.9.2", "jws": "^3.1.0", "ldapjs": "git+https://github.com/mcavage/node-ldapjs.git#acc1ca8f4314fd9d67561feabc8ce4c235076a5e", - "lodash": "^3.5.0", + "lodash": "^3.10.1", "markdown-serve": "^0.3.2", "mime": "^1.3.4", "minimatch": "^2.0.10", @@ -92,7 +92,7 @@ "gulp": "^3.8.11", "gulp-angular-gettext": "^2.1.0", "gulp-jade": "^1.0.0", - "gulp-jscs": "^1.4.0", + "gulp-jscs": "^2.0.0", "gulp-jshint": "^1.11.2", "gulp-jsonlint": "^1.0.2", "gulp-protractor": "^1.0.0", @@ -124,10 +124,10 @@ "node-sass": "^3.2.0", "phantomjs": "^1.9.17", "protractor": "^2.0.0", - "protractor-html-screenshot-reporter": "0.0.20", + "protractor-html-screenshot-reporter": "0.0.21", "raw-loader": "^0.5.1", "run-sequence": "^1.1.2", - "sass-loader": "^1.0.2", + "sass-loader": "^1.0.4", "script-loader": "^0.6.1", "sinon": "^1.14.1", "sinon-chai": "^2.7.0", diff --git a/res/app/components/stf/common-ui/table/index.js b/res/app/components/stf/common-ui/table/index.js index 1ccad6d3..a7439cc7 100644 --- a/res/app/components/stf/common-ui/table/index.js +++ b/res/app/components/stf/common-ui/table/index.js @@ -1,5 +1,5 @@ require('./table.css') -require('script!ng-table/ng-table') +require('script!ng-table/dist/ng-table') //require('ng-table/ng-table.css') module.exports = angular.module('stf/common-ui/table', [