From 3bbb156124fb1a35ff6e30f5f863a6f52ae73c35 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 17:49:14 +0200
Subject: [PATCH 01/16] Bug fixes

---
 app/views/header.blade.php            |  2 +-
 app/views/public/about_us.blade.php   |  2 +-
 app/views/public/contact_us.blade.php | 14 +-------------
 app/views/public/header.blade.php     | 17 +++++++++++++----
 app/views/public/splash.blade.php     |  4 ++--
 public/js/script.js                   |  2 --
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 0303b6ad202f..4813ee4d6538 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -456,7 +456,7 @@
 	      	if (isStorageSupported()) {
 	  			@if (Auth::check() && !Auth::user()->registered)
 	        		localStorage.setItem('guest_key', '{{ Auth::user()->password }}');
-				@endif
+  				@endif
         	}
   	
 			@if (!Auth::check() || !Auth::user()->registered)
diff --git a/app/views/public/about_us.blade.php b/app/views/public/about_us.blade.php
index 2623fcf69e3a..f6552c2995d4 100644
--- a/app/views/public/about_us.blade.php
+++ b/app/views/public/about_us.blade.php
@@ -74,7 +74,7 @@
       <div class="col-md-3 center-block">
         <a href="#">
           <div class="cta">
-            <h2 onclick="getStarted()">Invoice Now <span>+</span></h2>
+            <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
           </div>
         </a>
       </div>
diff --git a/app/views/public/contact_us.blade.php b/app/views/public/contact_us.blade.php
index d5f7cde55618..6f9d695baff2 100644
--- a/app/views/public/contact_us.blade.php
+++ b/app/views/public/contact_us.blade.php
@@ -53,18 +53,6 @@ var contactForm = {
   }
 };
 
-function isStorageSupported() {
-  try {
-    return 'localStorage' in window && window['localStorage'] !== null;
-  } catch (e) {
-    return false;
-  }
-}
-
-function getStarted() {
-  $('#startForm').submit();
-}
-
 </script>
 
 <section class="hero4" data-speed="2" data-type="background">
@@ -139,7 +127,7 @@ function getStarted() {
     <div class="col-md-3 center-block">
       <a href="#">
         <div class="cta">
-          <h2 onclick="getStarted()">Invoice Now <span>+</span></h2>
+          <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
         </div>
       </a>
     </div>
diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index 49f74f4b40f9..08983762017a 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -27,22 +27,31 @@
 
 
 <script>
-  $(document).ready(function () {
+  $(document).ready(function () {      
     if (isStorageSupported()) {
       $('[name="guest_key"]').val(localStorage.getItem('guest_key'));          
     }
   });
 
   function isStorageSupported() {
-    try {
-      return 'localStorage' in window && window['localStorage'] !== null;
-    } catch (e) {
+    if ('localStorage' in window && window['localStorage'] !== null) {
+      var storage = window.localStorage;
+    } else {
       return false;
     }
+    var testKey = 'test';
+    try {
+      storage.setItem(testKey, '1');
+      storage.removeItem(testKey);
+      return true;
+    } catch (error) {
+      return false;
+    }    
   }
 
   function getStarted() {
     $('#startForm').submit();
+    return false;
   }
 
 </script>    
diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php
index 2a520e2e525c..e948438dd1dd 100755
--- a/app/views/public/splash.blade.php
+++ b/app/views/public/splash.blade.php
@@ -27,7 +27,7 @@
           <div class="col-md-3 center-block">
             <a href="#">
               <div class="cta">
-                <h2 id="startButton" onclick="getStarted()">Invoice Now <span>+</span></h2>
+                <h2 id="startButton" onclick="return getStarted()">Invoice Now <span>+</span></h2>
               </div>
             </a>
           </div>
@@ -102,7 +102,7 @@
               <div class="col-md-3 center-block">
                 <a href="#">
                   <div class="cta">
-                    <h2 onclick="getStarted()">Invoice Now <span>+</span></h2>
+                    <h2 onclick="return getStarted()">Invoice Now <span>+</span></h2>
                   </div>
                 </a>
               </div>
diff --git a/public/js/script.js b/public/js/script.js
index dbbaac137766..618670d40ba7 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -793,8 +793,6 @@ function GetReportTemplate1(doc, invoice, layout, checkMath)
 
 
 
-
-
 function GetReportTemplate2(doc, invoice, layout, checkMath)
 {
   var GlobalY=0;//Y position of line at current page

From c08a46a7dad7284780a1f08dc4ff2326ba7a3946 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 17:59:30 +0200
Subject: [PATCH 02/16] Bug fixes

---
 app/views/master.blade.php |   2 +-
 public/images/social.jpg   | Bin 0 -> 14974 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 public/images/social.jpg

diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 0007b13cd929..113649767ff1 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -15,7 +15,7 @@
     <meta property="og:site_name" content="Invoice Ninja"></meta>
     <meta property="og:url" content="https://www.invoiceninja.com"></meta>
     <meta property="og:title" content="Invoice Ninja"></meta>
-    <meta property="og:image" content="https://www.invoiceninja.com/images/facebook.jpg"></meta>
+    <meta property="og:image" content="https://www.invoiceninja.com/images/social.jpg"></meta>
     <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
     <meta name="keywords" content="Invoice Ninja"></meta>
     
diff --git a/public/images/social.jpg b/public/images/social.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9770a82ccf587b711e98e515a1b9e93d40f47c70
GIT binary patch
literal 14974
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
Gto$$W5R<_G

literal 0
HcmV?d00001


From f9bec51b309d4cdb37ef021b8a4fa47ff4771a8b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 18:02:33 +0200
Subject: [PATCH 03/16] Bug fixes

---
 app/views/public/header.blade.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index 08983762017a..9c4e1321d0ac 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -102,6 +102,10 @@
           </script>       
           &nbsp;
 
+          <script src="//platform.linkedin.com/in.js" type="text/javascript">
+            lang: en_US
+          </script>
+          <script type="IN/Share" data-url="https://www.invoiceninja.com/"></script>
           <!--<iframe src="http://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=watch" allowtransparency="true" frameborder="0" scrolling="0" width="62" height="20"></iframe>-->
 
   <p>&nbsp;</p>

From e748ea7cc2ac4000413fe203990ac5bc67ea037f Mon Sep 17 00:00:00 2001
From: pierrefaure <pierrefaure.web@gmail.com>
Date: Sun, 23 Mar 2014 18:48:00 +0100
Subject: [PATCH 04/16] Update fields.php

Hi,

I'm not sure for line 42 :)
---
 app/lang/en/fields.php | 84 +++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/app/lang/en/fields.php b/app/lang/en/fields.php
index 10f5d738c39a..4af61a3cebae 100644
--- a/app/lang/en/fields.php
+++ b/app/lang/en/fields.php
@@ -3,52 +3,52 @@
 return array(
 
   // client
-  'organization' => 'Organization',
-  'name' => 'Name',
-  'website' => 'Website',
-  'work_phone' => 'Phone',
-  'address' => 'Address',
-  'address1' => 'Street',
-  'address2' => 'Apt/Suite',
-  'city' => 'City',
-  'state' => 'State/Province',
-  'postal_code' => 'Postal Code',
-  'country_id' => 'Country',
-  'contacts' => 'Contacts',
-  'first_name' => 'First Name',
-  'last_name' => 'Last Name',
-  'phone' => 'Phone',
+  'organization' => 'Entreprise',
+  'name' => 'Nom',
+  'website' => 'Site web',
+  'work_phone' => 'Téléphone',
+  'address' => 'Adresse',
+  'address1' => 'Rue',
+  'address2' => 'Appt/Batîment',
+  'city' => 'Ville',
+  'state' => 'Région/Département',
+  'postal_code' => 'Code Postal',
+  'country_id' => 'Pays',
+  'contacts' => 'Informations de contact', //if you speak about contact details
+  'first_name' => 'Prénom',
+  'last_name' => 'Nom',
+  'phone' => 'Téléphone',
   'email' => 'Email',
-  'additional_info' => 'Additional Info',
-  'payment_terms' => 'Payment Terms',
-  'currency_id' => 'Currency',
-  'size_id' => 'Size',
-  'industry_id' => 'Industry',
-  'private_notes' => 'Private Notes',
+  'additional_info' => 'Informations complémentaires',
+  'payment_terms' => 'Conditions de paiement',
+  'currency_id' => 'Devise',
+  'size_id' => 'Taille',
+  'industry_id' => 'Secteur', // literal translation : Industrie
+  'private_notes' => 'Note personnelle',
 
   // invoice
-  'invoice' => 'Invoice',
+  'invoice' => 'Facture',
   'client' => 'Client',
-  'invoice_date' => 'Invoice Date',
-  'due_date' => 'Due Date',
-  'invoice_number' => 'Invoice Number',
-  'invoice_number_short' => 'Invoice #',
-  'po_number' => 'PO Number',
-  'po_number_short' => 'PO #',
-  'frequency_id' => 'How often',
-  'dicount' => 'Discount',
+  'invoice_date' => 'Date de la facture',
+  'due_date' => 'Date d\'échéance',
+  'invoice_number' => 'Numéro de facture',
+  'invoice_number_short' => 'Facture #',
+  'po_number' => 'Numéro du bon de commande',
+  'po_number_short' => 'Bon de commande #',
+  'frequency_id' => 'Fréquence', //litteral translation : Combien de fois 
+  'dicount' => 'Remise', //can be "rabais" or "réduction"
   'taxes' => 'Taxes',
-  'tax' => 'Tax',
-  'item' => 'Item',
+  'tax' => 'Taxe',
+  'item' => 'Ligne', //I'm not sure, I need the context : screenshot ? 
   'description' => 'Description',
-  'unit_cost' => 'Unit Cost',
-  'quantity' => 'Quantity',
-  'line_total' => 'Line Total',
-  'subtotal' => 'Subtotal',
-  'paid_to_date' => 'Paid to Date',
-  'balance_due' => 'Balance Due',
-  'invoice_design_id' => 'Design',
-  'terms' => 'Terms',
-  'your_invoice' => 'Your Invoice',
+  'unit_cost' => 'Coût à l\'unité',
+  'quantity' => 'Quantité',
+  'line_total' => 'Total',
+  'subtotal' => 'Total',
+  'paid_to_date' => 'Versé à ce jour',//this one is not very used in France
+  'balance_due' => 'Montant total',//can be "Montant à verser" or "Somme totale"
+  'invoice_design_id' => 'Design', //if you speak about invoice's design -> "Modèle"
+  'terms' => 'Conditions',
+  'your_invoice' => 'Votre Facture',
   
-);
\ No newline at end of file
+);

From 9a592753b250defd02867b6dd22b043e5d055821 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 19:54:02 +0200
Subject: [PATCH 05/16] Bug fixes

---
 app/libraries/utils.php    |   2 +-
 app/views/header.blade.php |   2 +
 app/views/master.blade.php |   8 +-
 public/js/stacktrace.js    | 485 +++++++++++++++++++++++++++++++++++++
 4 files changed, 494 insertions(+), 3 deletions(-)
 create mode 100644 public/js/stacktrace.js

diff --git a/app/libraries/utils.php b/app/libraries/utils.php
index f4fb3bc68348..7ffacc13f207 100755
--- a/app/libraries/utils.php
+++ b/app/libraries/utils.php
@@ -41,7 +41,7 @@ class Utils
 			'input' => Input::all()
 		];
 
-		Log::error('\n'.$error, $data);
+		Log::error($error."\n", $data);
 
 		/*
 		Mail::queue('emails.error', ['message'=>$error.' '.json_encode($data)], function($message)
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index 4813ee4d6538..d698718ed697 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -385,6 +385,8 @@
   		}
 
       function submitSignUp() {
+        var d;
+        console.log(d.test());
         $.ajax({
           type: 'POST',
           url: '{{ URL::to('signup/submit') }}',
diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index 113649767ff1..e1db15749cd7 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -17,16 +17,20 @@
     <meta property="og:title" content="Invoice Ninja"></meta>
     <meta property="og:image" content="https://www.invoiceninja.com/images/social.jpg"></meta>
     <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
-    <meta name="keywords" content="Invoice Ninja"></meta>
+    <meta name="keywords" content="Invoice Ninja"></meta>    
     
+    <script src="{{ asset('js/stacktrace.js') }}" type="text/javascript"></script>  
     <script src="{{ asset('vendor/jquery/jquery.min.js') }}" type="text/javascript"></script>  
+
     <script type="text/javascript">
     window.onerror = function(e) {
+      var trace = printStackTrace();
+      var string = trace.join(' => ');
       try {
         $.ajax({
           type: 'GET',
           url: '{{ URL::to('log_error') }}',
-          data: 'error='+e+'&url='+window.location
+          data: 'error='+encodeURIComponent(e+': '+string)+'&url='+encodeURIComponent(window.location)
         });     
       } catch(err) {}
       return false;
diff --git a/public/js/stacktrace.js b/public/js/stacktrace.js
new file mode 100644
index 000000000000..92169fd825fc
--- /dev/null
+++ b/public/js/stacktrace.js
@@ -0,0 +1,485 @@
+// Domain Public by Eric Wendelin http://eriwen.com/ (2008)
+//                  Luke Smith http://lucassmith.name/ (2008)
+//                  Loic Dachary <loic@dachary.org> (2008)
+//                  Johan Euphrosine <proppy@aminche.com> (2008)
+//                  Oyvind Sean Kinsey http://kinsey.no/blog (2010)
+//                  Victor Homyakov <victor-homyakov@users.sourceforge.net> (2010)
+/*global module, exports, define, ActiveXObject*/
+(function(global, factory) {
+    if (typeof exports === 'object') {
+        // Node
+        module.exports = factory();
+    } else if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(factory);
+    } else {
+        // Browser globals
+        global.printStackTrace = factory();
+    }
+}(this, function() {
+    /**
+     * Main function giving a function stack trace with a forced or passed in Error
+     *
+     * @cfg {Error} e The error to create a stacktrace from (optional)
+     * @cfg {Boolean} guess If we should try to resolve the names of anonymous functions
+     * @return {Array} of Strings with functions, lines, files, and arguments where possible
+     */
+    function printStackTrace(options) {
+        options = options || {guess: true};
+        var ex = options.e || null, guess = !!options.guess;
+        var p = new printStackTrace.implementation(), result = p.run(ex);
+        return (guess) ? p.guessAnonymousFunctions(result) : result;
+    }
+
+    printStackTrace.implementation = function() {
+    };
+
+    printStackTrace.implementation.prototype = {
+        /**
+         * @param {Error} [ex] The error to create a stacktrace from (optional)
+         * @param {String} [mode] Forced mode (optional, mostly for unit tests)
+         */
+        run: function(ex, mode) {
+            ex = ex || this.createException();
+            mode = mode || this.mode(ex);
+            if (mode === 'other') {
+                return this.other(arguments.callee);
+            } else {
+                return this[mode](ex);
+            }
+        },
+
+        createException: function() {
+            try {
+                this.undef();
+            } catch (e) {
+                return e;
+            }
+        },
+
+        /**
+         * Mode could differ for different exception, e.g.
+         * exceptions in Chrome may or may not have arguments or stack.
+         *
+         * @return {String} mode of operation for the exception
+         */
+        mode: function(e) {
+            if (e['arguments'] && e.stack) {
+                return 'chrome';
+            }
+
+            if (e.stack && e.sourceURL) {
+                return 'safari';
+            }
+
+            if (e.stack && e.number) {
+                return 'ie';
+            }
+
+            if (e.stack && e.fileName) {
+                return 'firefox';
+            }
+
+            if (e.message && e['opera#sourceloc']) {
+                // e.message.indexOf("Backtrace:") > -1 -> opera9
+                // 'opera#sourceloc' in e -> opera9, opera10a
+                // !e.stacktrace -> opera9
+                if (!e.stacktrace) {
+                    return 'opera9'; // use e.message
+                }
+                if (e.message.indexOf('\n') > -1 && e.message.split('\n').length > e.stacktrace.split('\n').length) {
+                    // e.message may have more stack entries than e.stacktrace
+                    return 'opera9'; // use e.message
+                }
+                return 'opera10a'; // use e.stacktrace
+            }
+
+            if (e.message && e.stack && e.stacktrace) {
+                // e.stacktrace && e.stack -> opera10b
+                if (e.stacktrace.indexOf("called from line") < 0) {
+                    return 'opera10b'; // use e.stacktrace, format differs from 'opera10a'
+                }
+                // e.stacktrace && e.stack -> opera11
+                return 'opera11'; // use e.stacktrace, format differs from 'opera10a', 'opera10b'
+            }
+
+            if (e.stack && !e.fileName) {
+                // Chrome 27 does not have e.arguments as earlier versions,
+                // but still does not have e.fileName as Firefox
+                return 'chrome';
+            }
+
+            return 'other';
+        },
+
+        /**
+         * Given a context, function name, and callback function, overwrite it so that it calls
+         * printStackTrace() first with a callback and then runs the rest of the body.
+         *
+         * @param {Object} context of execution (e.g. window)
+         * @param {String} functionName to instrument
+         * @param {Function} callback function to call with a stack trace on invocation
+         */
+        instrumentFunction: function(context, functionName, callback) {
+            context = context || window;
+            var original = context[functionName];
+            context[functionName] = function instrumented() {
+                callback.call(this, printStackTrace().slice(4));
+                return context[functionName]._instrumented.apply(this, arguments);
+            };
+            context[functionName]._instrumented = original;
+        },
+
+        /**
+         * Given a context and function name of a function that has been
+         * instrumented, revert the function to it's original (non-instrumented)
+         * state.
+         *
+         * @param {Object} context of execution (e.g. window)
+         * @param {String} functionName to de-instrument
+         */
+        deinstrumentFunction: function(context, functionName) {
+            if (context[functionName].constructor === Function &&
+                context[functionName]._instrumented &&
+                context[functionName]._instrumented.constructor === Function) {
+                context[functionName] = context[functionName]._instrumented;
+            }
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Chrome's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        chrome: function(e) {
+            return (e.stack + '\n')
+                .replace(/^[\s\S]+?\s+at\s+/, ' at ') // remove message
+                .replace(/^\s+(at eval )?at\s+/gm, '') // remove 'at' and indentation
+                .replace(/^([^\(]+?)([\n$])/gm, '{anonymous}() ($1)$2')
+                .replace(/^Object.<anonymous>\s*\(([^\)]+)\)/gm, '{anonymous}() ($1)')
+                .replace(/^(.+) \((.+)\)$/gm, '$1@$2')
+                .split('\n')
+                .slice(0, -1);
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Safari's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        safari: function(e) {
+            return e.stack.replace(/\[native code\]\n/m, '')
+                .replace(/^(?=\w+Error\:).*$\n/m, '')
+                .replace(/^@/gm, '{anonymous}()@')
+                .split('\n');
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on IE's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        ie: function(e) {
+            return e.stack
+                .replace(/^\s*at\s+(.*)$/gm, '$1')
+                .replace(/^Anonymous function\s+/gm, '{anonymous}() ')
+                .replace(/^(.+)\s+\((.+)\)$/gm, '$1@$2')
+                .split('\n')
+                .slice(1);
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Firefox's stack string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        firefox: function(e) {
+            return e.stack.replace(/(?:\n@:0)?\s+$/m, '')
+                .replace(/^(?:\((\S*)\))?@/gm, '{anonymous}($1)@')
+                .split('\n');
+        },
+
+        opera11: function(e) {
+            var ANON = '{anonymous}', lineRE = /^.*line (\d+), column (\d+)(?: in (.+))? in (\S+):$/;
+            var lines = e.stacktrace.split('\n'), result = [];
+
+            for (var i = 0, len = lines.length; i < len; i += 2) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    var location = match[4] + ':' + match[1] + ':' + match[2];
+                    var fnName = match[3] || "global code";
+                    fnName = fnName.replace(/<anonymous function: (\S+)>/, "$1").replace(/<anonymous function>/, ANON);
+                    result.push(fnName + '@' + location + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                }
+            }
+
+            return result;
+        },
+
+        opera10b: function(e) {
+            // "<anonymous function: run>([arguments not available])@file://localhost/G:/js/stacktrace.js:27\n" +
+            // "printStackTrace([arguments not available])@file://localhost/G:/js/stacktrace.js:18\n" +
+            // "@file://localhost/G:/js/test/functional/testcase1.html:15"
+            var lineRE = /^(.*)@(.+):(\d+)$/;
+            var lines = e.stacktrace.split('\n'), result = [];
+
+            for (var i = 0, len = lines.length; i < len; i++) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    var fnName = match[1] ? (match[1] + '()') : "global code";
+                    result.push(fnName + '@' + match[2] + ':' + match[3]);
+                }
+            }
+
+            return result;
+        },
+
+        /**
+         * Given an Error object, return a formatted Array based on Opera 10's stacktrace string.
+         *
+         * @param e - Error object to inspect
+         * @return Array<String> of function calls, files and line numbers
+         */
+        opera10a: function(e) {
+            // "  Line 27 of linked script file://localhost/G:/js/stacktrace.js\n"
+            // "  Line 11 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html: In function foo\n"
+            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)(?:: In function (\S+))?$/i;
+            var lines = e.stacktrace.split('\n'), result = [];
+
+            for (var i = 0, len = lines.length; i < len; i += 2) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    var fnName = match[3] || ANON;
+                    result.push(fnName + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                }
+            }
+
+            return result;
+        },
+
+        // Opera 7.x-9.2x only!
+        opera9: function(e) {
+            // "  Line 43 of linked script file://localhost/G:/js/stacktrace.js\n"
+            // "  Line 7 of inline#1 script in file://localhost/G:/js/test/functional/testcase1.html\n"
+            var ANON = '{anonymous}', lineRE = /Line (\d+).*script (?:in )?(\S+)/i;
+            var lines = e.message.split('\n'), result = [];
+
+            for (var i = 2, len = lines.length; i < len; i += 2) {
+                var match = lineRE.exec(lines[i]);
+                if (match) {
+                    result.push(ANON + '()@' + match[2] + ':' + match[1] + ' -- ' + lines[i + 1].replace(/^\s+/, ''));
+                }
+            }
+
+            return result;
+        },
+
+        // Safari 5-, IE 9-, and others
+        other: function(curr) {
+            var ANON = '{anonymous}', fnRE = /function\s*([\w\-$]+)?\s*\(/i, stack = [], fn, args, maxStackSize = 10;
+            var slice = Array.prototype.slice;
+            while (curr && curr['arguments'] && stack.length < maxStackSize) {
+                fn = fnRE.test(curr.toString()) ? RegExp.$1 || ANON : ANON;
+                args = slice.call(curr['arguments'] || []);
+                stack[stack.length] = fn + '(' + this.stringifyArguments(args) + ')';
+                try {
+                    curr = curr.caller;
+                } catch (e) {
+                    stack[stack.length] = '' + e;
+                    break;
+                }
+            }
+            return stack;
+        },
+
+        /**
+         * Given arguments array as a String, substituting type names for non-string types.
+         *
+         * @param {Arguments,Array} args
+         * @return {String} stringified arguments
+         */
+        stringifyArguments: function(args) {
+            var result = [];
+            var slice = Array.prototype.slice;
+            for (var i = 0; i < args.length; ++i) {
+                var arg = args[i];
+                if (arg === undefined) {
+                    result[i] = 'undefined';
+                } else if (arg === null) {
+                    result[i] = 'null';
+                } else if (arg.constructor) {
+                    // TODO constructor comparison does not work for iframes
+                    if (arg.constructor === Array) {
+                        if (arg.length < 3) {
+                            result[i] = '[' + this.stringifyArguments(arg) + ']';
+                        } else {
+                            result[i] = '[' + this.stringifyArguments(slice.call(arg, 0, 1)) + '...' + this.stringifyArguments(slice.call(arg, -1)) + ']';
+                        }
+                    } else if (arg.constructor === Object) {
+                        result[i] = '#object';
+                    } else if (arg.constructor === Function) {
+                        result[i] = '#function';
+                    } else if (arg.constructor === String) {
+                        result[i] = '"' + arg + '"';
+                    } else if (arg.constructor === Number) {
+                        result[i] = arg;
+                    } else {
+                        result[i] = '?';
+                    }
+                }
+            }
+            return result.join(',');
+        },
+
+        sourceCache: {},
+
+        /**
+         * @return the text from a given URL
+         */
+        ajax: function(url) {
+            var req = this.createXMLHTTPObject();
+            if (req) {
+                try {
+                    req.open('GET', url, false);
+                    //req.overrideMimeType('text/plain');
+                    //req.overrideMimeType('text/javascript');
+                    req.send(null);
+                    //return req.status == 200 ? req.responseText : '';
+                    return req.responseText;
+                } catch (e) {
+                }
+            }
+            return '';
+        },
+
+        /**
+         * Try XHR methods in order and store XHR factory.
+         *
+         * @return <Function> XHR function or equivalent
+         */
+        createXMLHTTPObject: function() {
+            var xmlhttp, XMLHttpFactories = [
+                function() {
+                    return new XMLHttpRequest();
+                }, function() {
+                    return new ActiveXObject('Msxml2.XMLHTTP');
+                }, function() {
+                    return new ActiveXObject('Msxml3.XMLHTTP');
+                }, function() {
+                    return new ActiveXObject('Microsoft.XMLHTTP');
+                }
+            ];
+            for (var i = 0; i < XMLHttpFactories.length; i++) {
+                try {
+                    xmlhttp = XMLHttpFactories[i]();
+                    // Use memoization to cache the factory
+                    this.createXMLHTTPObject = XMLHttpFactories[i];
+                    return xmlhttp;
+                } catch (e) {
+                }
+            }
+        },
+
+        /**
+         * Given a URL, check if it is in the same domain (so we can get the source
+         * via Ajax).
+         *
+         * @param url <String> source url
+         * @return <Boolean> False if we need a cross-domain request
+         */
+        isSameDomain: function(url) {
+            return typeof location !== "undefined" && url.indexOf(location.hostname) !== -1; // location may not be defined, e.g. when running from nodejs.
+        },
+
+        /**
+         * Get source code from given URL if in the same domain.
+         *
+         * @param url <String> JS source URL
+         * @return <Array> Array of source code lines
+         */
+        getSource: function(url) {
+            // TODO reuse source from script tags?
+            if (!(url in this.sourceCache)) {
+                this.sourceCache[url] = this.ajax(url).split('\n');
+            }
+            return this.sourceCache[url];
+        },
+
+        guessAnonymousFunctions: function(stack) {
+            for (var i = 0; i < stack.length; ++i) {
+                var reStack = /\{anonymous\}\(.*\)@(.*)/,
+                    reRef = /^(.*?)(?::(\d+))(?::(\d+))?(?: -- .+)?$/,
+                    frame = stack[i], ref = reStack.exec(frame);
+
+                if (ref) {
+                    var m = reRef.exec(ref[1]);
+                    if (m) { // If falsey, we did not get any file/line information
+                        var file = m[1], lineno = m[2], charno = m[3] || 0;
+                        if (file && this.isSameDomain(file) && lineno) {
+                            var functionName = this.guessAnonymousFunction(file, lineno, charno);
+                            stack[i] = frame.replace('{anonymous}', functionName);
+                        }
+                    }
+                }
+            }
+            return stack;
+        },
+
+        guessAnonymousFunction: function(url, lineNo, charNo) {
+            var ret;
+            try {
+                ret = this.findFunctionName(this.getSource(url), lineNo);
+            } catch (e) {
+                ret = 'getSource failed with url: ' + url + ', exception: ' + e.toString();
+            }
+            return ret;
+        },
+
+        findFunctionName: function(source, lineNo) {
+            // FIXME findFunctionName fails for compressed source
+            // (more than one function on the same line)
+            // function {name}({args}) m[1]=name m[2]=args
+            var reFunctionDeclaration = /function\s+([^(]*?)\s*\(([^)]*)\)/;
+            // {name} = function ({args}) TODO args capture
+            // /['"]?([0-9A-Za-z_]+)['"]?\s*[:=]\s*function(?:[^(]*)/
+            var reFunctionExpression = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*function\b/;
+            // {name} = eval()
+            var reFunctionEvaluation = /['"]?([$_A-Za-z][$_A-Za-z0-9]*)['"]?\s*[:=]\s*(?:eval|new Function)\b/;
+            // Walk backwards in the source lines until we find
+            // the line which matches one of the patterns above
+            var code = "", line, maxLines = Math.min(lineNo, 20), m, commentPos;
+            for (var i = 0; i < maxLines; ++i) {
+                // lineNo is 1-based, source[] is 0-based
+                line = source[lineNo - i - 1];
+                commentPos = line.indexOf('//');
+                if (commentPos >= 0) {
+                    line = line.substr(0, commentPos);
+                }
+                // TODO check other types of comments? Commented code may lead to false positive
+                if (line) {
+                    code = line + code;
+                    m = reFunctionExpression.exec(code);
+                    if (m && m[1]) {
+                        return m[1];
+                    }
+                    m = reFunctionDeclaration.exec(code);
+                    if (m && m[1]) {
+                        //return m[1] + "(" + (m[2] || "") + ")";
+                        return m[1];
+                    }
+                    m = reFunctionEvaluation.exec(code);
+                    if (m && m[1]) {
+                        return m[1];
+                    }
+                }
+            }
+            return '(?)';
+        }
+    };
+
+    return printStackTrace;
+}));

From 94f5047d4650e04385cabdabd0a68294c7b194d2 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 19:55:29 +0200
Subject: [PATCH 06/16] Bug fixes

---
 app/views/header.blade.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index d698718ed697..4813ee4d6538 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -385,8 +385,6 @@
   		}
 
       function submitSignUp() {
-        var d;
-        console.log(d.test());
         $.ajax({
           type: 'POST',
           url: '{{ URL::to('signup/submit') }}',

From 2efde97a4e714c5db687340f05f430a22267b605 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 19:59:15 +0200
Subject: [PATCH 07/16] Bug fixes

---
 app/lang/en/fields.php | 84 +++++++++++++++++++++---------------------
 app/lang/fr/fields.php | 84 +++++++++++++++++++++---------------------
 2 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/app/lang/en/fields.php b/app/lang/en/fields.php
index 4af61a3cebae..10f5d738c39a 100644
--- a/app/lang/en/fields.php
+++ b/app/lang/en/fields.php
@@ -3,52 +3,52 @@
 return array(
 
   // client
-  'organization' => 'Entreprise',
-  'name' => 'Nom',
-  'website' => 'Site web',
-  'work_phone' => 'Téléphone',
-  'address' => 'Adresse',
-  'address1' => 'Rue',
-  'address2' => 'Appt/Batîment',
-  'city' => 'Ville',
-  'state' => 'Région/Département',
-  'postal_code' => 'Code Postal',
-  'country_id' => 'Pays',
-  'contacts' => 'Informations de contact', //if you speak about contact details
-  'first_name' => 'Prénom',
-  'last_name' => 'Nom',
-  'phone' => 'Téléphone',
+  'organization' => 'Organization',
+  'name' => 'Name',
+  'website' => 'Website',
+  'work_phone' => 'Phone',
+  'address' => 'Address',
+  'address1' => 'Street',
+  'address2' => 'Apt/Suite',
+  'city' => 'City',
+  'state' => 'State/Province',
+  'postal_code' => 'Postal Code',
+  'country_id' => 'Country',
+  'contacts' => 'Contacts',
+  'first_name' => 'First Name',
+  'last_name' => 'Last Name',
+  'phone' => 'Phone',
   'email' => 'Email',
-  'additional_info' => 'Informations complémentaires',
-  'payment_terms' => 'Conditions de paiement',
-  'currency_id' => 'Devise',
-  'size_id' => 'Taille',
-  'industry_id' => 'Secteur', // literal translation : Industrie
-  'private_notes' => 'Note personnelle',
+  'additional_info' => 'Additional Info',
+  'payment_terms' => 'Payment Terms',
+  'currency_id' => 'Currency',
+  'size_id' => 'Size',
+  'industry_id' => 'Industry',
+  'private_notes' => 'Private Notes',
 
   // invoice
-  'invoice' => 'Facture',
+  'invoice' => 'Invoice',
   'client' => 'Client',
-  'invoice_date' => 'Date de la facture',
-  'due_date' => 'Date d\'échéance',
-  'invoice_number' => 'Numéro de facture',
-  'invoice_number_short' => 'Facture #',
-  'po_number' => 'Numéro du bon de commande',
-  'po_number_short' => 'Bon de commande #',
-  'frequency_id' => 'Fréquence', //litteral translation : Combien de fois 
-  'dicount' => 'Remise', //can be "rabais" or "réduction"
+  'invoice_date' => 'Invoice Date',
+  'due_date' => 'Due Date',
+  'invoice_number' => 'Invoice Number',
+  'invoice_number_short' => 'Invoice #',
+  'po_number' => 'PO Number',
+  'po_number_short' => 'PO #',
+  'frequency_id' => 'How often',
+  'dicount' => 'Discount',
   'taxes' => 'Taxes',
-  'tax' => 'Taxe',
-  'item' => 'Ligne', //I'm not sure, I need the context : screenshot ? 
+  'tax' => 'Tax',
+  'item' => 'Item',
   'description' => 'Description',
-  'unit_cost' => 'Coût à l\'unité',
-  'quantity' => 'Quantité',
-  'line_total' => 'Total',
-  'subtotal' => 'Total',
-  'paid_to_date' => 'Versé à ce jour',//this one is not very used in France
-  'balance_due' => 'Montant total',//can be "Montant à verser" or "Somme totale"
-  'invoice_design_id' => 'Design', //if you speak about invoice's design -> "Modèle"
-  'terms' => 'Conditions',
-  'your_invoice' => 'Votre Facture',
+  'unit_cost' => 'Unit Cost',
+  'quantity' => 'Quantity',
+  'line_total' => 'Line Total',
+  'subtotal' => 'Subtotal',
+  'paid_to_date' => 'Paid to Date',
+  'balance_due' => 'Balance Due',
+  'invoice_design_id' => 'Design',
+  'terms' => 'Terms',
+  'your_invoice' => 'Your Invoice',
   
-);
+);
\ No newline at end of file
diff --git a/app/lang/fr/fields.php b/app/lang/fr/fields.php
index 10f5d738c39a..4af61a3cebae 100644
--- a/app/lang/fr/fields.php
+++ b/app/lang/fr/fields.php
@@ -3,52 +3,52 @@
 return array(
 
   // client
-  'organization' => 'Organization',
-  'name' => 'Name',
-  'website' => 'Website',
-  'work_phone' => 'Phone',
-  'address' => 'Address',
-  'address1' => 'Street',
-  'address2' => 'Apt/Suite',
-  'city' => 'City',
-  'state' => 'State/Province',
-  'postal_code' => 'Postal Code',
-  'country_id' => 'Country',
-  'contacts' => 'Contacts',
-  'first_name' => 'First Name',
-  'last_name' => 'Last Name',
-  'phone' => 'Phone',
+  'organization' => 'Entreprise',
+  'name' => 'Nom',
+  'website' => 'Site web',
+  'work_phone' => 'Téléphone',
+  'address' => 'Adresse',
+  'address1' => 'Rue',
+  'address2' => 'Appt/Batîment',
+  'city' => 'Ville',
+  'state' => 'Région/Département',
+  'postal_code' => 'Code Postal',
+  'country_id' => 'Pays',
+  'contacts' => 'Informations de contact', //if you speak about contact details
+  'first_name' => 'Prénom',
+  'last_name' => 'Nom',
+  'phone' => 'Téléphone',
   'email' => 'Email',
-  'additional_info' => 'Additional Info',
-  'payment_terms' => 'Payment Terms',
-  'currency_id' => 'Currency',
-  'size_id' => 'Size',
-  'industry_id' => 'Industry',
-  'private_notes' => 'Private Notes',
+  'additional_info' => 'Informations complémentaires',
+  'payment_terms' => 'Conditions de paiement',
+  'currency_id' => 'Devise',
+  'size_id' => 'Taille',
+  'industry_id' => 'Secteur', // literal translation : Industrie
+  'private_notes' => 'Note personnelle',
 
   // invoice
-  'invoice' => 'Invoice',
+  'invoice' => 'Facture',
   'client' => 'Client',
-  'invoice_date' => 'Invoice Date',
-  'due_date' => 'Due Date',
-  'invoice_number' => 'Invoice Number',
-  'invoice_number_short' => 'Invoice #',
-  'po_number' => 'PO Number',
-  'po_number_short' => 'PO #',
-  'frequency_id' => 'How often',
-  'dicount' => 'Discount',
+  'invoice_date' => 'Date de la facture',
+  'due_date' => 'Date d\'échéance',
+  'invoice_number' => 'Numéro de facture',
+  'invoice_number_short' => 'Facture #',
+  'po_number' => 'Numéro du bon de commande',
+  'po_number_short' => 'Bon de commande #',
+  'frequency_id' => 'Fréquence', //litteral translation : Combien de fois 
+  'dicount' => 'Remise', //can be "rabais" or "réduction"
   'taxes' => 'Taxes',
-  'tax' => 'Tax',
-  'item' => 'Item',
+  'tax' => 'Taxe',
+  'item' => 'Ligne', //I'm not sure, I need the context : screenshot ? 
   'description' => 'Description',
-  'unit_cost' => 'Unit Cost',
-  'quantity' => 'Quantity',
-  'line_total' => 'Line Total',
-  'subtotal' => 'Subtotal',
-  'paid_to_date' => 'Paid to Date',
-  'balance_due' => 'Balance Due',
-  'invoice_design_id' => 'Design',
-  'terms' => 'Terms',
-  'your_invoice' => 'Your Invoice',
+  'unit_cost' => 'Coût à l\'unité',
+  'quantity' => 'Quantité',
+  'line_total' => 'Total',
+  'subtotal' => 'Total',
+  'paid_to_date' => 'Versé à ce jour',//this one is not very used in France
+  'balance_due' => 'Montant total',//can be "Montant à verser" or "Somme totale"
+  'invoice_design_id' => 'Design', //if you speak about invoice's design -> "Modèle"
+  'terms' => 'Conditions',
+  'your_invoice' => 'Votre Facture',
   
-);
\ No newline at end of file
+);

From bb6815ba133162573a14e977e746af2d7d010bdc Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 20:01:00 +0200
Subject: [PATCH 08/16] Bug fixes

---
 app/libraries/utils.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/libraries/utils.php b/app/libraries/utils.php
index 7ffacc13f207..086762c31a95 100755
--- a/app/libraries/utils.php
+++ b/app/libraries/utils.php
@@ -37,8 +37,7 @@ class Utils
 			'url' => Input::get('url', Request::url()),
 			'user_agent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '',
 			'ip' => Request::getClientIp(),
-			'count' => Session::get('error_count', 0),
-			'input' => Input::all()
+			'count' => Session::get('error_count', 0)
 		];
 
 		Log::error($error."\n", $data);

From a09b898cb1f876a28ced54341ef178e347750041 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 20:19:03 +0200
Subject: [PATCH 09/16] Bug fixes

---
 app/lang/en/fields.php                       |  2 +-
 app/lang/fr/fields.php                       |  2 +-
 app/lang/pt_BR/fields.php                    | 25 ++++++++++++++++++++
 app/models/Account.php                       |  2 +-
 public/js/jspdf.plugin.split_text_to_size.js |  1 -
 public/js/script.js                          |  5 ++--
 6 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/lang/en/fields.php b/app/lang/en/fields.php
index 10f5d738c39a..6a0bcaa7b21b 100644
--- a/app/lang/en/fields.php
+++ b/app/lang/en/fields.php
@@ -36,7 +36,7 @@ return array(
   'po_number' => 'PO Number',
   'po_number_short' => 'PO #',
   'frequency_id' => 'How often',
-  'dicount' => 'Discount',
+  'discount' => 'Discount',
   'taxes' => 'Taxes',
   'tax' => 'Tax',
   'item' => 'Item',
diff --git a/app/lang/fr/fields.php b/app/lang/fr/fields.php
index 4af61a3cebae..37dc8e1df81d 100644
--- a/app/lang/fr/fields.php
+++ b/app/lang/fr/fields.php
@@ -36,7 +36,7 @@ return array(
   'po_number' => 'Numéro du bon de commande',
   'po_number_short' => 'Bon de commande #',
   'frequency_id' => 'Fréquence', //litteral translation : Combien de fois 
-  'dicount' => 'Remise', //can be "rabais" or "réduction"
+  'discount' => 'Remise', //can be "rabais" or "réduction"
   'taxes' => 'Taxes',
   'tax' => 'Taxe',
   'item' => 'Ligne', //I'm not sure, I need the context : screenshot ? 
diff --git a/app/lang/pt_BR/fields.php b/app/lang/pt_BR/fields.php
index 523f0a85b598..a405467cfeb4 100644
--- a/app/lang/pt_BR/fields.php
+++ b/app/lang/pt_BR/fields.php
@@ -25,4 +25,29 @@ return array(
   'industry_id' => 'Empresa',
   'private_notes' => 'Notas Privadas',
 
+  // invoice
+  'invoice' => 'Invoice',
+  'client' => 'Client',
+  'invoice_date' => 'Invoice Date',
+  'due_date' => 'Due Date',
+  'invoice_number' => 'Invoice Number',
+  'invoice_number_short' => 'Invoice #',
+  'po_number' => 'PO Number',
+  'po_number_short' => 'PO #',
+  'frequency_id' => 'How often',
+  'discount' => 'Discount',
+  'taxes' => 'Taxes',
+  'tax' => 'Tax',
+  'item' => 'Item',
+  'description' => 'Description',
+  'unit_cost' => 'Unit Cost',
+  'quantity' => 'Quantity',
+  'line_total' => 'Line Total',
+  'subtotal' => 'Subtotal',
+  'paid_to_date' => 'Paid to Date',
+  'balance_due' => 'Balance Due',
+  'invoice_design_id' => 'Design',
+  'terms' => 'Terms',
+  'your_invoice' => 'Your Invoice',
+
 );
diff --git a/app/models/Account.php b/app/models/Account.php
index bc74165573bc..208ec4541dc1 100755
--- a/app/models/Account.php
+++ b/app/models/Account.php
@@ -178,7 +178,7 @@ class Account extends Eloquent
   		'due_date',
   		'invoice_number',
 		  'po_number',
-		  'dicount',
+		  'discount',
   		'taxes',
   		'tax',
   		'item',
diff --git a/public/js/jspdf.plugin.split_text_to_size.js b/public/js/jspdf.plugin.split_text_to_size.js
index 93b9a48f4a7b..9d74d442afea 100755
--- a/public/js/jspdf.plugin.split_text_to_size.js
+++ b/public/js/jspdf.plugin.split_text_to_size.js
@@ -39,7 +39,6 @@ cell ocupied by the width of the char in that position.
 @returns {Array}
 */
 var getCharWidthsArray = API.getCharWidthsArray = function(text, options){
-
 	if (!options) {
 		options = {}
 	}
diff --git a/public/js/script.js b/public/js/script.js
index 618670d40ba7..f0e8dc402792 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1355,9 +1355,10 @@ function concatStrings() {
 function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, rightAlignTitleX)  {
   var numLines = 0;
   var origY = y;
+
   for (var i=0; i<data.length; i++) {
     doc.setFontType('normal');
-    
+      
     if (invoice.invoice_design_id == 1 && i > 0 && origY === layout.accountTop) {
       SetPdfColor('GrayText',doc);
     }
@@ -1398,8 +1399,8 @@ function displayGrid(doc, invoice, data, x, y, layout, hasheader, rightAlignX, r
       */
       
       doc.setFontType('normal');
-
       key = invoiceLabels[key];
+
       if (rightAlignTitleX) {
         marginLeft = rightAlignTitleX - (doc.getStringUnitWidth(key) * doc.internal.getFontSize());
       } else {

From db3a6abad361d5a294ac33786d9e1e907920ce45 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 21:17:45 +0200
Subject: [PATCH 10/16] Bug fixes

---
 app/views/master.blade.php  |   5 +----
 public/apple-touch-icon.png | Bin 0 -> 2207 bytes
 2 files changed, 1 insertion(+), 4 deletions(-)
 create mode 100644 public/apple-touch-icon.png

diff --git a/app/views/master.blade.php b/app/views/master.blade.php
index e1db15749cd7..9dc7676cf63a 100755
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@@ -19,18 +19,15 @@
     <meta property="og:description" content="Simple, Intuitive Invoicing."></meta>
     <meta name="keywords" content="Invoice Ninja"></meta>    
     
-    <script src="{{ asset('js/stacktrace.js') }}" type="text/javascript"></script>  
     <script src="{{ asset('vendor/jquery/jquery.min.js') }}" type="text/javascript"></script>  
 
     <script type="text/javascript">
     window.onerror = function(e) {
-      var trace = printStackTrace();
-      var string = trace.join(' => ');
       try {
         $.ajax({
           type: 'GET',
           url: '{{ URL::to('log_error') }}',
-          data: 'error='+encodeURIComponent(e+': '+string)+'&url='+encodeURIComponent(window.location)
+          data: 'error='+encodeURIComponent(e)+'&url='+encodeURIComponent(window.location)
         });     
       } catch(err) {}
       return false;
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a5a5d1f069d56ae9a746137d0935e098f12bd07
GIT binary patch
literal 2207
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
BoDKj0

literal 0
HcmV?d00001


From b99427b05c06455831cd0fe07d2e3011368e9fbf Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 21:38:03 +0200
Subject: [PATCH 11/16] Bug fixes

---
 app/controllers/AccountController.php |   2 +-
 app/handlers/UserEventHandler.php     |   8 ++++----
 app/models/Account.php                |   2 +-
 public/apple-touch-icon.png           | Bin
 4 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 public/apple-touch-icon.png

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index d82c2ebccf32..68ef3b41ebad 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -500,7 +500,7 @@ class AccountController extends \BaseController {
 		} 
 		else 
 		{
-			$account = Account::findOrFail(Auth::user()->account_id);
+			$account = Auth::user()->account;
 			$account->name = trim(Input::get('name'));
 			$account->work_email = trim(Input::get('work_email'));
 			$account->work_phone = trim(Input::get('work_phone'));
diff --git a/app/handlers/UserEventHandler.php b/app/handlers/UserEventHandler.php
index 31753f6a0157..5e6a24955287 100755
--- a/app/handlers/UserEventHandler.php
+++ b/app/handlers/UserEventHandler.php
@@ -17,11 +17,11 @@ class UserEventHandler
 
 	public function onLogin()
 	{
-        $account = Auth::user()->account;
-        $account->last_login = Carbon::now()->toDateTimeString();
-        $account->save();
+    $account = Auth::user()->account;
+    $account->last_login = Carbon::now()->toDateTimeString();
+    $account->save();
 
-        Event::fire('user.refresh');
+    Event::fire('user.refresh');
 	}
 
 	public function onRefresh()
diff --git a/app/models/Account.php b/app/models/Account.php
index 208ec4541dc1..f821fb009e86 100755
--- a/app/models/Account.php
+++ b/app/models/Account.php
@@ -166,7 +166,7 @@ class Account extends Eloquent
 		Session::put(SESSION_DATE_FORMAT, $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT);
 		Session::put(SESSION_DATE_PICKER_FORMAT, $this->date_format ? $this->date_format->picker_format : DEFAULT_DATE_PICKER_FORMAT);
 		Session::put(SESSION_DATETIME_FORMAT, $this->datetime_format ? $this->datetime_format->format : DEFAULT_DATETIME_FORMAT);			
-		Session::put(SESSION_CURRENCY, $this->currency_id ? $this->currency_id : DEFAULT_CURRENCY);					
+		Session::put(SESSION_CURRENCY, $this->currency_id ? $this->currency_id : DEFAULT_CURRENCY);		
 	}
 
 	public function getInvoiceLabels()
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
old mode 100644
new mode 100755

From 684d8562787b03c709e656896fcd6b6ed4e41d0c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 21:39:18 +0200
Subject: [PATCH 12/16] Bug fixes

---
 app/views/public/header.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php
index 9c4e1321d0ac..c7fc4859ea33 100644
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@@ -102,10 +102,13 @@
           </script>       
           &nbsp;
 
+          <!--
           <script src="//platform.linkedin.com/in.js" type="text/javascript">
             lang: en_US
           </script>
           <script type="IN/Share" data-url="https://www.invoiceninja.com/"></script>
+          -->
+                    
           <!--<iframe src="http://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=watch" allowtransparency="true" frameborder="0" scrolling="0" width="62" height="20"></iframe>-->
 
   <p>&nbsp;</p>

From e77db4137eaad93173f91ddfd4741c2381301da8 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 22:16:46 +0200
Subject: [PATCH 13/16] Updating readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 98dfbef05972..4d95bf88318f 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 
 Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies. 
 
-For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
+Highlevel instructions for setting up the site are below but there's also [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
 
-For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja)
+For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja).
 
 Site design by [kantorp-wegl.in](http://kantorp-wegl.in/)
 

From 56e3e7dbd06e07d44c860fee19d4950c167fc9c8 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 22:17:53 +0200
Subject: [PATCH 14/16] Updating readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4d95bf88318f..b2ebdd75de95 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies. 
 
-Highlevel instructions for setting up the site are below but there's also [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
+The high level instructions for setting up the site are below but there's also [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
 
 For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja).
 

From 499b92ac8746526a9547958f04e3729ebd4ddb04 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 22:18:13 +0200
Subject: [PATCH 15/16] Updating readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2ebdd75de95..1be56f78a9f5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies. 
 
-The high level instructions for setting up the site are below but there's also [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
+The high level instructions for setting up the site are below but there's also a [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
 
 For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja).
 

From 53f9eef3cac67709d7ce59c3af73c43198c9c439 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 23 Mar 2014 22:56:19 +0200
Subject: [PATCH 16/16] Bug fixes

---
 app/controllers/InvoiceController.php        |  2 +-
 app/ninja/repositories/InvoiceRepository.php |  8 ++++----
 app/views/public/splash.blade.php            | 10 ++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index 6cd3d2295f2b..f805745c152c 100755
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@@ -89,7 +89,7 @@ class InvoiceController extends \BaseController {
     	$table->addColumn('frequency', function($model) { return link_to('invoices/' . $model->public_id, $model->frequency); });
 
     	if (!$clientPublicId) {
-    		$table->addColumn('client', function($model) { return link_to('clients/' . $model->client_public_id, Utils::getClientDisplayName($model)); });
+    		$table->addColumn('client_name', function($model) { return link_to('clients/' . $model->client_public_id, Utils::getClientDisplayName($model)); });
     	}
     	
     	return $table->addColumn('start_date', function($model) { return Utils::fromSqlDate($model->start_date); })
diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index c8327d0311a8..5f31ab7cc2c0 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -50,13 +50,13 @@ class InvoiceRepository
 	{
     	$query = \DB::table('invoices')
     				->join('clients', 'clients.id', '=','invoices.client_id')
-					->join('frequencies', 'frequencies.id', '=', 'invoices.frequency_id')
-					->join('contacts', 'contacts.client_id', '=', 'clients.id')
-					->where('invoices.account_id', '=', $accountId)
+  					->join('frequencies', 'frequencies.id', '=', 'invoices.frequency_id')
+	   				->join('contacts', 'contacts.client_id', '=', 'clients.id')
+		  			->where('invoices.account_id', '=', $accountId)
             ->where('clients.deleted_at', '=', null)
     				->where('invoices.is_recurring', '=', true)
     				->where('contacts.is_primary', '=', true)	
-					->select('clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'frequencies.name as frequency', 'start_date', 'end_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email');
+			   		->select('clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'frequencies.name as frequency', 'start_date', 'end_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email');
 
     	if ($clientPublicId) 
     	{
diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php
index e948438dd1dd..ec56f0dd9bcf 100755
--- a/app/views/public/splash.blade.php
+++ b/app/views/public/splash.blade.php
@@ -40,7 +40,7 @@
         <div class="row">
           <div class="col-md-3 one">
             <div class="box">
-              <div class="icon"><img src="images/icon-free.png"></div>
+              <div class="icon"><img src="{{ asset('images/icon-free.png') }}"></div>
               <h2>100% FREE, ALWAYS</h2>
               <p>Invoicing with no monthly fee, because you have enough bills already! Free, now and forever! Quality invoicing to build your business and get paid.</p>
             </div>
@@ -48,8 +48,7 @@
 
           <div class="col-md-3 two">
             <div class="box">
-              <div class="icon"><img src=
-                "images/icon-opensource.png"></div>
+              <div class="icon"><img src="{{ asset('images/icon-opensource.png') }}"></div>
                 <h2>OPEN-SOURCE</h2>
                 <p>Cloud-based, super secure, and user-developed. Open source platforms are a better way to do business (and save the world). Need we say more?</p>
               </div>
@@ -57,7 +56,7 @@
 
             <div class="col-md-3 three">
               <div class="box">
-                <div class="icon"><img src="images/icon-pdf.png"></div>
+                <div class="icon"><img src="{{ asset('images/icon-pdf.png') }}"></div>
                 <h2>LIVE .PDF VIEW</h2>
                 <p>Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.</p>
               </div>
@@ -65,8 +64,7 @@
 
             <div class="col-md-3 four">
               <div class="box">
-                <div class="icon"><img src=
-                  "images/icon-payment.png"></div>
+                <div class="icon"><img src="{{ asset('images/icon-payment.png') }}"></div>
                   <h2>ONLINE PAYMENTS</h2>
                   <p>PayPal? Authorize.Net? Stripe? We support many payment technologies and if you need help or advice we’ll lend a hand (we’re pretty friendly).</p>
                 </div>