Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

Gruntfile.js

@@ -164,7 +164,7 @@ module.exports = function(grunt) {
             process: false
         }
       },
-      js_pdf: {
+      /*js_pdf: {
         src: [
           'public/js/pdf_viewer.js',
           'public/js/compatibility.js',
@@ -173,7 +173,7 @@ module.exports = function(grunt) {
         ],
         dest: 'public/pdf.built.js',
         nonull: true
-      }
+      }*/
     }
   });
 

composer.json

@@ -140,7 +140,7 @@
                     "type": "zip"
                 },
                 "source": {
-                    "url": "git@github.com:gatepay/FedACHdir.git",
+                    "url": "https://github.com/gatepay/FedACHdir.git",
                     "type": "git",
                     "reference": "origin/master"
                 }

gulpfile.js

@@ -41,6 +41,15 @@ elixir(function(mix) {
     /**
      * JS configuration
      */
+    mix.scripts(['resources/assets/js/Chart.js'], 'public/js/Chart.min.js')
+        .scripts(['resources/assets/js/d3.js'], 'public/js/d3.min.js');
+    
+    mix.scripts([
+        'public/js/pdf_viewer.js',
+        'public/js/compatibility.js',
+        'public/js/pdfmake.min.js',
+        'public/js/vfs.js'
+    ], 'public/pdf.built.js');
 
 
 });

resources/views/reports/chart_builder.blade.php

@@ -3,7 +3,7 @@
 @section('head')
 	@parent
 
-	<script src="{!! asset('js/Chart.js') !!}" type="text/javascript"></script>		
+	<script src="{!! asset('js/Chart.min.js') !!}" type="text/javascript"></script>
 @stop
 
 @section('content')