diff --git a/.env.example b/.env.example index 651ccbbc5207..bd40885edb04 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,7 @@ APP_ENV=development APP_DEBUG=true APP_URL=http://ninja.dev +APP_CIPHER=rijndael-128 APP_KEY= DB_TYPE=mysql diff --git a/app/Console/Commands/SendRecurringInvoices.php b/app/Console/Commands/SendRecurringInvoices.php index ece16d94baa5..a5fe2cdaf9b9 100644 --- a/app/Console/Commands/SendRecurringInvoices.php +++ b/app/Console/Commands/SendRecurringInvoices.php @@ -1,9 +1,15 @@ users()->first(); //Auth::login($user, true); + $this->accountRepo->registerUser($user); return Redirect::to('/login'); } diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 294a4eef1ba3..ead3f9fa38b7 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -236,8 +236,6 @@ Invoice::deleting(function ($invoice) { Activity::archiveInvoice($invoice); }); -// TODO: Fix for L5 -/*Invoice::restoring(function ($invoice) { +Invoice::restoring(function ($invoice) { Activity::restoreInvoice($invoice); }); -*/ \ No newline at end of file diff --git a/config/app.php b/config/app.php index 9a72079f9e25..4568f97c6fdd 100644 --- a/config/app.php +++ b/config/app.php @@ -80,7 +80,7 @@ return [ 'key' => env('APP_KEY', ''), - 'cipher' => MCRYPT_RIJNDAEL_128, + 'cipher' => env('APP_CIPHER', MCRYPT_RIJNDAEL_128), /* |-------------------------------------------------------------------------- diff --git a/readme.md b/readme.md index 1ccf35513890..19c0729c75de 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ ### [https://www.invoiceninja.com](https://www.invoiceninja.com) -#### Note: the application has recently been updated to Laravel 5. Please use the [1.7.x branch](https://github.com/hillelcoren/invoice-ninja/tree/1.7.x) for a more stable build. +#### Please [click here](https://bitnami.com/stack/invoice-ninja) to vote for us to be added to Bitnami's one-click install library If you'd like to use our code to sell your own invoicing app we have an affiliate program. Get in touch for more details. diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 9bebd1fb3b3a..c7a15dfe3a85 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -105,6 +105,7 @@ @if (!Utils::isNinja())

+ + +

 

+

 

+ + +
@endif