diff --git a/bower.json b/bower.json index 3a85c34207e..d764f63f10d 100644 --- a/bower.json +++ b/bower.json @@ -14,17 +14,17 @@ ], "dependencies": { "jquery-ui": "1.10.4", - "jquery": "1.11.*", - "angular": "~1.2", - "angular-sanitize": "~1.2", - "angular-animate": "~1.2", - "angular-cookies": "~1.2", - "angular-mocks": "~1.2", - "ngDialog": "~0.2", - "html5shiv": "~3.7", - "mousetrap": "~1.4", + "jquery": "~1.11.0", + "angular": "~1.2.0", + "angular-sanitize": "~1.2.0", + "angular-animate": "~1.2.0", + "angular-cookies": "~1.2.0", + "angular-mocks": "~1.2.0", + "ngDialog": "~0.2.0", + "html5shiv": "~3.7.0", + "mousetrap": "~1.4.0", "sprintf": "~1.0.0", - "jScrollPane": "~2.0.14", + "jScrollPane": "~2.0.0", "jquery-mousewheel": "~3.1.12", "jquery-placeholder": "~2.0.8", "jquery.scrollTo": "~1.4.13", diff --git a/libs/bower_components/angular-animate/.bower.json b/libs/bower_components/angular-animate/.bower.json index 5d207c32393..bd1be862d97 100644 --- a/libs/bower_components/angular-animate/.bower.json +++ b/libs/bower_components/angular-animate/.bower.json @@ -13,6 +13,6 @@ "commit": "453c5ac3ad0beb28e8296655c2e4079b5e0f31da" }, "_source": "git://github.com/angular/bower-angular-animate.git", - "_target": "~1.2", + "_target": "~1.2.0", "_originalSource": "angular-animate" } \ No newline at end of file diff --git a/libs/bower_components/angular-cookies/.bower.json b/libs/bower_components/angular-cookies/.bower.json index 654ea1567ef..f79863da69e 100644 --- a/libs/bower_components/angular-cookies/.bower.json +++ b/libs/bower_components/angular-cookies/.bower.json @@ -13,6 +13,6 @@ "commit": "0cefe0c4ca703bc8b137933ecdc36ace116ca270" }, "_source": "git://github.com/angular/bower-angular-cookies.git", - "_target": "~1.2", + "_target": "~1.2.0", "_originalSource": "angular-cookies" } \ No newline at end of file diff --git a/libs/bower_components/angular-mocks/.bower.json b/libs/bower_components/angular-mocks/.bower.json index 58b0f0fcbe0..deeac2a2a7b 100644 --- a/libs/bower_components/angular-mocks/.bower.json +++ b/libs/bower_components/angular-mocks/.bower.json @@ -13,6 +13,6 @@ "commit": "0eda339dd42aba2628586f39d4806bcfb57fd6f4" }, "_source": "git://github.com/angular/bower-angular-mocks.git", - "_target": "~1.2", + "_target": "~1.2.0", "_originalSource": "angular-mocks" } \ No newline at end of file diff --git a/libs/bower_components/angular-sanitize/.bower.json b/libs/bower_components/angular-sanitize/.bower.json index 624771b44a3..79e65452fbe 100644 --- a/libs/bower_components/angular-sanitize/.bower.json +++ b/libs/bower_components/angular-sanitize/.bower.json @@ -13,6 +13,6 @@ "commit": "738348ea8ec9e1153f938fff1427129cd76d6007" }, "_source": "git://github.com/angular/bower-angular-sanitize.git", - "_target": "~1.2", + "_target": "~1.2.0", "_originalSource": "angular-sanitize" } \ No newline at end of file diff --git a/libs/bower_components/angular/.bower.json b/libs/bower_components/angular/.bower.json index ab0e1cb3742..6278bf77b79 100644 --- a/libs/bower_components/angular/.bower.json +++ b/libs/bower_components/angular/.bower.json @@ -11,6 +11,6 @@ "commit": "7308d8d650b2b9948796035cbf6f3b175d45efe0" }, "_source": "git://github.com/angular/bower-angular.git", - "_target": "~1.2", + "_target": "~1.2.0", "_originalSource": "angular" } \ No newline at end of file diff --git a/libs/bower_components/html5shiv/.bower.json b/libs/bower_components/html5shiv/.bower.json index 2622e8c5e3f..b2f6e65d15f 100644 --- a/libs/bower_components/html5shiv/.bower.json +++ b/libs/bower_components/html5shiv/.bower.json @@ -20,6 +20,6 @@ "commit": "40df868a76f1f19ea23b123d1480d44a7195f349" }, "_source": "git://github.com/aFarkas/html5shiv.git", - "_target": "~3.7", + "_target": "~3.7.0", "_originalSource": "html5shiv" } \ No newline at end of file diff --git a/libs/bower_components/jScrollPane/.bower.json b/libs/bower_components/jScrollPane/.bower.json index 06a8501dae2..0dbc55afc68 100644 --- a/libs/bower_components/jScrollPane/.bower.json +++ b/libs/bower_components/jScrollPane/.bower.json @@ -9,6 +9,6 @@ "commit": "f4042d628a6a593462239fe5eb74a7f7d386f2a7" }, "_source": "git://github.com/vitch/jScrollPane.git", - "_target": "~2.0.14", + "_target": "~2.0.0", "_originalSource": "jScrollPane" } \ No newline at end of file diff --git a/libs/bower_components/jquery/.bower.json b/libs/bower_components/jquery/.bower.json index 0d63d59b3f6..2575902bd89 100644 --- a/libs/bower_components/jquery/.bower.json +++ b/libs/bower_components/jquery/.bower.json @@ -32,6 +32,6 @@ "commit": "0d5ec2d8ac94a419ee47a39319c43ff9a7326b50" }, "_source": "git://github.com/jquery/jquery.git", - "_target": "~1.11", + "_target": "~1.11.0", "_originalSource": "jquery" } \ No newline at end of file diff --git a/libs/bower_components/mousetrap/.bower.json b/libs/bower_components/mousetrap/.bower.json index 979cb051442..b6484caaa9f 100644 --- a/libs/bower_components/mousetrap/.bower.json +++ b/libs/bower_components/mousetrap/.bower.json @@ -9,6 +9,6 @@ "commit": "d50e8d64950277f968290d703d47686c5accbac0" }, "_source": "git://github.com/ccampbell/mousetrap.git", - "_target": "~1.4", + "_target": "~1.4.0", "_originalSource": "mousetrap" } \ No newline at end of file diff --git a/libs/bower_components/ngDialog/.bower.json b/libs/bower_components/ngDialog/.bower.json index c85a020750b..c690de1684b 100644 --- a/libs/bower_components/ngDialog/.bower.json +++ b/libs/bower_components/ngDialog/.bower.json @@ -42,6 +42,6 @@ "commit": "c81c4e3b51837ea03b848bf63a8590cd0cb45aef" }, "_source": "git://github.com/likeastore/ngDialog.git", - "_target": "~0.2", + "_target": "~0.2.0", "_originalSource": "ngDialog" } \ No newline at end of file diff --git a/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php b/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php index c7c0bdc01cb..968c68c35fa 100644 --- a/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php +++ b/tests/PHPUnit/Integration/AssetManager/UIAssetMinifierTest.php @@ -27,7 +27,7 @@ public function provider_isMinifiedJs() { return array( array('libs/bower_components/jquery/dist/jquery.min.js', true), - array('libs/bower_components/jquery-ui/jquery-ui.min.js', true), + array('libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js', true), array('libs/jquery/jquery.browser.js', true), array('libs/jqplot/jqplot-custom.min.js', true), array('plugins/TreemapVisualization/libs/Jit/jit-2.0.1-yc.js', true),