From cd3f35c0d3d465f7fc992fb3c7b7638300900522 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Wed, 11 Nov 2015 13:40:20 +0100 Subject: [PATCH 1/2] Fix dependency issue, which prevents the client to show any data in the tables overview --- app/index.html | 3 ++- bower.json | 24 ++++++++++++------------ package.json | 46 +++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/app/index.html b/app/index.html index 6673866..8dc20aa 100644 --- a/app/index.html +++ b/app/index.html @@ -32,6 +32,7 @@ + @@ -41,7 +42,7 @@ - + diff --git a/bower.json b/bower.json index 15cbb3c..b6a3eef 100644 --- a/bower.json +++ b/bower.json @@ -2,23 +2,23 @@ "name": "oasp-js", "version": "0.0.1", "dependencies": { - "modernizr": "2.6.x", - "respond": "1.1.x", + "modernizr": "3.2.x", + "respond": "1.4.x", "bootstrap": "3.3.x", - "angular": "1.3.x", - "angular-route": "1.3.x", - "angular-ui-select": "0.8.x", + "angular": "1.4.x", + "angular-route": "1.4.x", + "angular-ui-select": "0.13.x", "autofill-event": "1.0.x", - "angular-ui-bootstrap-bower": "0.12.x", - "angular-translate": "2.5.x", - "angular-translate-loader-partial": "2.5.x", - "angular-spinner": "0.5.x", - "trNgGrid": "3.0.x", - "sockjs-client": "0.3.x", + "angular-ui-bootstrap-bower": "0.14.x", + "angular-translate": "2.8.x", + "angular-translate-loader-partial": "2.8.x", + "angular-spinner": "0.8.x", + "trNgGrid": "3.1.x", + "sockjs-client": "1.0.x", "stomp-websocket": "2.3.x" }, "devDependencies": { - "angular-mocks": "1.3.x" + "angular-mocks": "1.4.x" }, "resolutions": { "angular": ">=1.3" diff --git a/package.json b/package.json index fd2e794..062ed57 100644 --- a/package.json +++ b/package.json @@ -7,60 +7,60 @@ "connect": "3.4.0" }, "devDependencies": { - "browser-sync": "2.7.x", + "browser-sync": "2.10.x", "chalk": "1.x", "coveralls": "2.11.x", - "del": "1.2.x", + "del": "2.0.x", "gulp": "3.9.x", - "gulp-concat": "2.4.x", - "gulp-filter": "2.0.X", - "gulp-flatten": "0.1.x", - "gulp-git": "1.2.x", + "gulp-concat": "2.6.x", + "gulp-filter": "3.0.x", + "gulp-flatten": "0.2.x", + "gulp-git": "1.6.x", "gulp-header": "1.7.x", - "gulp-if": "1.2.x", - "gulp-imagemin": "2.3.x", - "gulp-inject": "1.3.x", - "gulp-insert": "0.4.x", - "gulp-jshint": "1.11.x", + "gulp-if": "2.0.x", + "gulp-imagemin": "2.4.x", + "gulp-inject": "3.0.x", + "gulp-insert": "0.5.x", + "gulp-jshint": "1.12.x", "gulp-karma": "0.0.x", "gulp-less": "3.0.x", - "gulp-load-plugins": "0.10.x", + "gulp-load-plugins": "1.1.x", "gulp-minify-css": "1.2.x", "gulp-minify-html": "1.0.x", - "gulp-newer": "0.5.x", - "gulp-ng-annotate": "1.0.x", + "gulp-newer": "1.0.x", + "gulp-ng-annotate": "1.1.x", "gulp-ng-templates": "0.0.x", "gulp-processhtml": "1.1.x", "gulp-protractor": "1.0.x", "gulp-replace": "0.5.x", - "gulp-rev": "5.1.x", - "gulp-size": "1.2.x", - "gulp-sonar": "1.0.x", - "gulp-sourcemaps": "1.5.x", + "gulp-rev": "6.0.x", + "gulp-size": "2.0.x", + "gulp-sonar": "2.0.x", + "gulp-sourcemaps": "1.6.x", "gulp-sync": "0.1.x", - "gulp-uglify": "1.2.x", + "gulp-uglify": "1.4.x", "gulp-usemin": "0.3.x", "gulp-util": "3.x", - "gulp.spritesmith": "3.8.x", + "gulp.spritesmith": "4.2.x", "http-proxy": "1.x", "jasmine-core": "2.3.x", "jshint-stylish": "2.0.x", "karma": "0.12.x", "karma-chrome-launcher": "0.2.x", - "karma-coverage": "0.4.x", + "karma-coverage": "0.5.x", "karma-jasmine": "0.3.x", "karma-junit-reporter": "0.3.x", "karma-phantomjs-launcher": "0.2.x", "lodash": "3.x", "main-bower-files": "2.9.x", "phantomjs": "1.9.x", - "protractor": "2.1.x", + "protractor": "2.5.x", "require-dir": "0.3.x", "string": "3.3.x", "through2": "2.x", "uglify-save-license": "0.4.x", "wiredep": "2.2.x", - "yargs": "3.15.x" + "yargs": "3.29.x" }, "engine": "node >= 0.10.0", "scripts": { From bf40f36af7f1f798464e4a3914791b22c7477820 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Sun, 15 Nov 2015 18:22:42 +0100 Subject: [PATCH 2/2] further dependency stabilization --- bower.json | 30 +++++++------- package.json | 108 +++++++++++++++++++++++++-------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/bower.json b/bower.json index b6a3eef..8d7be76 100644 --- a/bower.json +++ b/bower.json @@ -2,23 +2,23 @@ "name": "oasp-js", "version": "0.0.1", "dependencies": { - "modernizr": "3.2.x", - "respond": "1.4.x", - "bootstrap": "3.3.x", - "angular": "1.4.x", - "angular-route": "1.4.x", - "angular-ui-select": "0.13.x", - "autofill-event": "1.0.x", - "angular-ui-bootstrap-bower": "0.14.x", - "angular-translate": "2.8.x", - "angular-translate-loader-partial": "2.8.x", - "angular-spinner": "0.8.x", - "trNgGrid": "3.1.x", - "sockjs-client": "1.0.x", - "stomp-websocket": "2.3.x" + "modernizr": "3.2.0", + "respond": "1.4.2", + "bootstrap": "3.3.5", + "angular": "1.4.7", + "angular-route": "1.4.7", + "angular-ui-select": "0.13.2", + "autofill-event": "1.0.0", + "angular-ui-bootstrap-bower": "0.14.3", + "angular-translate": "2.8.1", + "angular-translate-loader-partial": "2.8.1", + "angular-spinner": "0.8.0", + "trNgGrid": "3.1.5", + "sockjs-client": "1.0.3", + "stomp-websocket": "2.3.4" }, "devDependencies": { - "angular-mocks": "1.4.x" + "angular-mocks": "1.4.7" }, "resolutions": { "angular": ">=1.3" diff --git a/package.json b/package.json index 062ed57..f7bd2df 100644 --- a/package.json +++ b/package.json @@ -7,60 +7,60 @@ "connect": "3.4.0" }, "devDependencies": { - "browser-sync": "2.10.x", - "chalk": "1.x", - "coveralls": "2.11.x", - "del": "2.0.x", - "gulp": "3.9.x", - "gulp-concat": "2.6.x", - "gulp-filter": "3.0.x", - "gulp-flatten": "0.2.x", - "gulp-git": "1.6.x", - "gulp-header": "1.7.x", - "gulp-if": "2.0.x", - "gulp-imagemin": "2.4.x", - "gulp-inject": "3.0.x", - "gulp-insert": "0.5.x", - "gulp-jshint": "1.12.x", - "gulp-karma": "0.0.x", - "gulp-less": "3.0.x", - "gulp-load-plugins": "1.1.x", - "gulp-minify-css": "1.2.x", - "gulp-minify-html": "1.0.x", - "gulp-newer": "1.0.x", - "gulp-ng-annotate": "1.1.x", - "gulp-ng-templates": "0.0.x", - "gulp-processhtml": "1.1.x", - "gulp-protractor": "1.0.x", - "gulp-replace": "0.5.x", - "gulp-rev": "6.0.x", - "gulp-size": "2.0.x", - "gulp-sonar": "2.0.x", - "gulp-sourcemaps": "1.6.x", - "gulp-sync": "0.1.x", - "gulp-uglify": "1.4.x", - "gulp-usemin": "0.3.x", - "gulp-util": "3.x", - "gulp.spritesmith": "4.2.x", - "http-proxy": "1.x", - "jasmine-core": "2.3.x", - "jshint-stylish": "2.0.x", - "karma": "0.12.x", - "karma-chrome-launcher": "0.2.x", - "karma-coverage": "0.5.x", - "karma-jasmine": "0.3.x", - "karma-junit-reporter": "0.3.x", - "karma-phantomjs-launcher": "0.2.x", - "lodash": "3.x", - "main-bower-files": "2.9.x", - "phantomjs": "1.9.x", - "protractor": "2.5.x", - "require-dir": "0.3.x", - "string": "3.3.x", - "through2": "2.x", - "uglify-save-license": "0.4.x", - "wiredep": "2.2.x", - "yargs": "3.29.x" + "browser-sync": "2.10.0", + "chalk": "1.1.1", + "coveralls": "2.11.4", + "del": "2.1.0", + "gulp": "3.9.0", + "gulp-concat": "2.6.0", + "gulp-filter": "3.0.1", + "gulp-flatten": "0.2.0", + "gulp-git": "1.6.0", + "gulp-header": "1.7.1", + "gulp-if": "2.0.0", + "gulp-imagemin": "2.4.0", + "gulp-inject": "3.0.0", + "gulp-insert": "0.5.0", + "gulp-jshint": "1.12.0", + "gulp-karma": "0.0.5", + "gulp-less": "3.0.5", + "gulp-load-plugins": "1.1.0", + "gulp-minify-css": "1.2.1", + "gulp-minify-html": "1.0.4", + "gulp-newer": "1.0.0", + "gulp-ng-annotate": "1.1.0", + "gulp-ng-templates": "0.0.6", + "gulp-processhtml": "1.1.0", + "gulp-protractor": "1.0.0", + "gulp-replace": "0.5.4", + "gulp-rev": "6.0.1", + "gulp-size": "2.0.0", + "gulp-sonar": "2.0.0", + "gulp-sourcemaps": "1.6.0", + "gulp-sync": "0.1.4", + "gulp-uglify": "1.5.1", + "gulp-usemin": "0.3.15", + "gulp-util": "3.0.7", + "gulp.spritesmith": "4.3.0", + "http-proxy": "1.12.0", + "jasmine-core": "2.3.4", + "jshint-stylish": "2.1.0", + "karma": "0.12.37", + "karma-chrome-launcher": "0.2.1", + "karma-coverage": "0.5.3", + "karma-jasmine": "0.3.6", + "karma-junit-reporter": "0.3.8", + "karma-phantomjs-launcher": "0.2.1", + "lodash": "3.10.1", + "main-bower-files": "2.9.0", + "phantomjs": "1.9.18", + "protractor": "2.5.1", + "require-dir": "0.3.0", + "string": "3.3.1", + "through2": "2.0.0", + "uglify-save-license": "0.4.1", + "wiredep": "2.2.2", + "yargs": "3.30.0" }, "engine": "node >= 0.10.0", "scripts": {