Merge pull request #1718 from CachetHQ/js

Fixed chart.js and rebuilt assets

bower.json

@@ -4,7 +4,7 @@
     "animate-sass": "~0.6",
     "autosize": "~3.0.15",
     "bootstrap-sass": "~3.3",
-    "chartjs": "~2.0.0-beta2",
+    "chartjs": "~2.0.2",
     "eonasdan-bootstrap-datetimepicker": "~3.1",
     "humane-js": "~3.2",
     "ionicons": "~2.0",

gulpfile.js

@@ -24,7 +24,7 @@ elixir(function (mix) {
             'vendor/bower_components/livestampjs/livestamp.js',
             'vendor/bower_components/jquery-minicolors/jquery.minicolors.js',
             'vendor/bower_components/jquery-serialize-object/jquery.serialize-object.js',
-            'vendor/bower_components/chartjs/Chart.js',
+            'vendor/bower_components/chartjs/dist/Chart.js',
             'vendor/bower_components/jquery-sparkline/dist/jquery.sparkline.js',
             'vendor/bower_components/sweetalert/dist/sweetalert.min.js',
             'resources/assets/js/password-strength.js',

public/build/rev-manifest.json

@@ -1,4 +1,4 @@
 {
   "dist/css/all.css": "dist/css/all-5d444fe92b.css",
-  "dist/js/all.js": "dist/js/all-84f6fb9f0b.js"
+  "dist/js/all.js": "dist/js/all-98b897c006.js"
 }