fixated angular version

julianseeger · Jun 30, 2014 · 0fe3d19 · 0fe3d19
1 parent c11bf60
commit 0fe3d19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/web/app/index.html b/web/app/index.html
@@ -83,6 +83,7 @@
     <!-- bower:js -->
     <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/json3/lib/json3.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/angular-resource/angular-resource.js"></script>
     <script src="bower_components/angular-cookies/angular-cookies.js"></script>
@@ -93,10 +94,10 @@
     <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
     <script src="bower_components/ng-file-upload/angular-file-upload.js"></script>
     <script src="bower_components/jquery-ui/ui/jquery-ui.js"></script>
+    <script src="bower_components/highcharts-ng/dist/highcharts-ng.js"></script>
     <script src="bower_components/highcharts-release/highcharts.js"></script>
     <script src="bower_components/highcharts-release/highcharts-more.js"></script>
     <script src="bower_components/highcharts-release/modules/exporting.src.js"></script>
-      <script src="bower_components/highcharts-ng/dist/highcharts-ng.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 

diff --git a/web/bower.json b/web/bower.json
@@ -23,5 +23,8 @@
     "angular-mocks": "1.2.16",
     "angular-scenario": "1.2.16"
   },
-  "appPath": "app"
+  "appPath": "app",
+  "resolutions": {
+    "angular": ">=1"
+  }
 }
diff --git a/web/package.json b/web/package.json
@@ -3,7 +3,9 @@
   "version": "0.0.0",
   "dependencies": {
     "bower": "^1.3.5",
-    "grunt-cli": "^0.1.13"
+    "grunt-cli": "^0.1.13",
+    "inherits": "^2.0.1",
+    "minimatch": "^0.3.0"
   },
   "devDependencies": {
     "grunt": "^0.4.5",