Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -14,8 +14,6 @@
 /composer.lock
 /.DS_Store
 /Thumbs.db
-/app.yaml
-/database.sql
 /ninja.sublime-project
 /ninja.sublime-workspace
 /tests/_log

README.md

@@ -66,4 +66,3 @@ Configure config/database.php and then initialize the database
 * [nnnick/Chart.js](https://github.com/nnnick/Chart.js) - Simple HTML5 Charts using the <canvas> tag
 * [josscrowcroft/accounting.js](https://github.com/josscrowcroft/accounting.js) - A lightweight JavaScript library for number, money and currency formatting
 * [jashkenas/underscore](https://github.com/jashkenas/underscore) - JavaScript's utility _ belt 
-* [davejamesmiller/laravel-breadcrumbs](https://github.com/davejamesmiller/laravel-breadcrumbs) - A simple Laravel-style way to create breadcrumbs in Laravel 4

app/config/packages/zizaco/confide/config.php

@@ -70,7 +70,7 @@ return array(
     |
     */
 
-    'email_reset_password' =>       'confide::emails.passwordreset', // with $user and $token.
+    'email_reset_password' =>       'emails.passwordreset_html', // with $user and $token.
     'email_account_confirmation' => 'emails.confirm_html', // with $user
 
     /*

app/models/Credit.php

@@ -4,12 +4,12 @@ class Credit extends EntityModel
 {	
 	public function invoice()
 	{
-		return $this->belongsTo('Invoice');
+		return $this->belongsTo('Invoice')->withTrashed();
 	}
 
 	public function client()
 	{
-		return $this->belongsTo('Client');
+		return $this->belongsTo('Client')->withTrashed();
 	}
 
 	public function getName()

app/models/Invoice.php

@@ -9,7 +9,7 @@ class Invoice extends EntityModel
 
 	public function client()
 	{
-		return $this->belongsTo('Client');
+		return $this->belongsTo('Client')->withTrashed();
 	}
 
 	public function invoice_items()

app/models/Payment.php

@@ -4,7 +4,7 @@ class Payment extends EntityModel
 {
 	public function invoice()
 	{
-		return $this->belongsTo('Invoice');
+		return $this->belongsTo('Invoice')->withTrashed();;
 	}
 
 	public function invitation()
@@ -14,7 +14,7 @@ class Payment extends EntityModel
 
 	public function client()
 	{
-		return $this->belongsTo('Client');
+		return $this->belongsTo('Client')->withTrashed();;
 	}
 
 	public function account()

app/ninja/mailers/Mailer.php

@@ -11,7 +11,9 @@ abstract class Mailer {
 			'emails.'.$view.'_text'
 		];
 
-		Mail::queue($views, $data, function($message) use ($toEmail, $fromEmail, $subject)
+		$view = 'emails.' . $view;
+
+		Mail::queue($view, $data, function($message) use ($toEmail, $fromEmail, $subject)
 		{			
 			$message->to($toEmail)->replyTo($fromEmail)->subject($subject);
 		});		

app/views/dashboard.blade.php

@@ -132,7 +132,7 @@
       <div class="in-thin in-white">{{ Utils::pluralize('active client', $activeClients) }}</div>
     </div>
     <div class="col-md-6 average-invoice">  
-      <div><b>average invoice</b></div>
+      <div><b>Average invoice</b></div>
       <div class="in-bold in-white" style="font-size:42px">{{ $invoiceAvg }}</div>
     </div>
   </div> 

app/views/emails/invoice_html.blade.php

@@ -12,7 +12,7 @@
       {{ $link }}<p/>
 
       @if ($emailFooter)
-      {{ $emailFooter }}
+      {{ nl2br($emailFooter) }}
       @else
       Best regards,<br/>
       {{ $accountName }}

app/views/emails/passwordreset_html.blade.php

@@ -0,0 +1,8 @@
+Hi there! {{ $user->username }}<p/>
+
+You can reset your account password by clicking the following link {{{ (Confide::checkAction('UserController@reset_password', array($token))) ? : URL::to('user/reset/'.$token)  }}}<p/>
+
+Regards, <br/>
+The InvoiceNinja Team <p/>
+
+If you did not request this password reset please email our support: admin@invoiceninja.com <p/>

app/views/emails/payment_confirmation_html.blade.php

@@ -10,7 +10,7 @@
       Thank you for your payment of {{ $paymentAmount }}.<p/>
 
       @if ($emailFooter)
-      {{ $emailFooter }}
+      {{ nl2br($emailFooter) }}
       @else
       Best regards,<br/>
       {{ $accountName }}

app/views/invoices/edit.blade.php

@@ -209,7 +209,7 @@
 
 		{{ Button::normal('Download PDF', array('onclick' => 'onDownloadClick()')) }}	
 		
-		@if (!$invoice || !$invoice->trashed())						
+		@if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed()))						
 			@if ($invoice)		
 
 				<div id="primaryActions" style="text-align:left" data-bind="css: $root.enable.save" class="btn-group">

app/views/users/forgot_password.blade.php

@@ -2,6 +2,8 @@
 
 @section('head')	
 
+	  <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+
     <style type="text/css">
 		body {
 		  padding-top: 40px;

app/views/users/reset_password.blade.php

@@ -2,6 +2,8 @@
 
 @section('head')	
 
+	  <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/> 
+
     <style type="text/css">
 		body {
 		  padding-top: 40px;