# HG changeset patch # User ymh # Date 1461583302 -7200 # Node ID 7203efa0ddbf2a7df34605a98bc154257730a3e1 # Parent 76ae75975ee28d5edccaf8e43b61bd4b5c10500f upgrade dependencies diff -r 76ae75975ee2 -r 7203efa0ddbf cms/app-client/bower.json --- a/cms/app-client/bower.json Mon Apr 25 12:53:47 2016 +0200 +++ b/cms/app-client/bower.json Mon Apr 25 13:21:42 2016 +0200 @@ -3,15 +3,15 @@ "dependencies": { "ember": "~2.5.0", "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", + "ember-cli-test-loader": "1.1.0", "ember-qunit-notifications": "0.1.0", "jquery": "^2.2", "qunit": "~1.18.0", "bootstrap-sass": "bootstrap-sass-official#~3.3.6", "ammap3": "~3.18.6", - "font-awesome": "~4.4.0", - "pretender": "~0.10.1", - "lodash": "~3.7.0", + "font-awesome": "~4.6.1", + "pretender": "~1.1.0", + "lodash": "~4.11.1", "Faker": "~3.0.0", "store": "https://github.com/marcuswestin/store.js.git#v1.3.20" } diff -r 76ae75975ee2 -r 7203efa0ddbf cms/app-client/package.json --- a/cms/app-client/package.json Mon Apr 25 12:53:47 2016 +0200 +++ b/cms/app-client/package.json Mon Apr 25 13:21:42 2016 +0200 @@ -38,7 +38,7 @@ "ember-cli-mirage": "0.1.13", "ember-cli-jshint": "^1.0.0", "ember-cli-qunit": "^1.4.0", - "ember-cli-release": "0.2.8", + "ember-cli-release": "1.0.0-beta.1", "ember-cli-sass": "5.3.1", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0", diff -r 76ae75975ee2 -r 7203efa0ddbf server/bo_client/bower.json --- a/server/bo_client/bower.json Mon Apr 25 12:53:47 2016 +0200 +++ b/server/bo_client/bower.json Mon Apr 25 13:21:42 2016 +0200 @@ -3,18 +3,15 @@ "dependencies": { "ember": "~2.5.0", "ember-cli-shims": "0.1.1", - "ember-cli-test-loader": "0.2.2", + "ember-cli-test-loader": "1.1.0", "ember-qunit-notifications": "0.1.0", "jquery": "^2.2", "loader.js": "^4.0.0", "qunit": "~1.20.0", "bootstrap-sass": "bootstrap-sass-official#~3.3.6", - "font-awesome": "~4.5.0", + "font-awesome": "~4.6.1", "typeahead.js": "~0.11.1", "urijs": "URIjs#~1.17.0", "store": "https://github.com/marcuswestin/store.js.git#v1.3.20" - }, - "resolutions": { - "jquery": ">=2.2" } } diff -r 76ae75975ee2 -r 7203efa0ddbf server/bo_client/package.json --- a/server/bo_client/package.json Mon Apr 25 12:53:47 2016 +0200 +++ b/server/bo_client/package.json Mon Apr 25 13:21:42 2016 +0200 @@ -27,7 +27,7 @@ "broccoli-static-compiler": "^0.2.2", "corpus-common-addon": "file:../../common/corpus-common-addon", "ember-ajax": "^2.0.1", - "ember-aupac-typeahead": "2.0.6", + "ember-aupac-typeahead": "2.0.7", "ember-cli": "2.6.0-beta.1", "ember-cli-app-version": "^1.0.0", "ember-cli-babel": "^5.1.6", @@ -37,7 +37,7 @@ "ember-cli-inject-live-reload": "^1.4.0", "ember-cli-jshint": "^1.0.0", "ember-cli-qunit": "^1.4.0", - "ember-cli-release": "0.2.8", + "ember-cli-release": "1.0.0-beta.1", "ember-cli-sass": "5.3.1", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^1.2.0",