wubdut

.gitignore

@@ -6,6 +6,8 @@ tmp/
 build.number
 build/
 dist
+:wq
 *.iml
 .vscode
 .idea
+.back

Gruntfile.js

@@ -58,8 +58,9 @@ module.exports = function (grunt) {
         }
       },
       options: {
-        jshintrc: '.jshintrc',
-        reporterOutput: ''
+        jshintrc:'.jshintrc',
+        reporterOutput: '',
+        force: true,
       }
     },
     htmlmin:{
@@ -229,7 +230,8 @@ module.exports = function (grunt) {
         'jquery.flot.pie',
         'angular-sanitize',
         'angular-dragdrop',
-        'd3'
+        'd3',
+        'echarts',
       ]
     }
   ];
@@ -266,7 +268,7 @@ module.exports = function (grunt) {
     'requirejs:build',
     'clean:temp',
     'build:write_revision',
-    'uglify:dest'
+    'uglify:dest',
   ]);
 
   // run a string replacement on the require config, using the latest revision number as the cache buster

bower.json

@@ -4,11 +4,7 @@
   "homepage": "https://github.com/LucidWorks/banana/wiki",
   "license": "Apache License",
   "dependencies": {
-    "angular": "1.0.8",
-    "angular-loader": "1.0.8",
-    "angular-mocks": "1.0.8",
-    "angular-sanitize": "1.0.8",
-    "angular-strap": "0.7.5",
+    "angular": "1.6.4",
     "bootstrap": "2.3.2",
     "d3": "~3.4.11",
     "jquery": "1.12.1",
@@ -17,10 +13,20 @@
     "requirejs": "2.1.8",
     "modernizr": "2.6.1",
     "moment": "2.1.0",
-    "underscore": "1.5.1"
+    "underscore": "1.5.1",
+    "angular-loader": "^1.6.4",
+    "angular-mocks": "^1.6.4",
+    "angular-sanitize": "^1.6.4",
+    "angular-strap": "0.7.5",
+    "angular-material": "^1.1.4",
+    "angular-route": "^1.6.4",
+    "angular-smart-table": "^2.1.8",
+    "angular-dragdrop": "^1.0.13",
+    "jspdf": "^1.3.4",
+    "html2canvas": "^0.4.1"
   },
   "resolutions": {
-    "angular": "1.0.8",
+    "angular": "1.6.4",
     "jquery": "1.12.1",
     "bootstrap": "2.3.2"
   }