Merge branch 'develop' into feature/credit_calc

# Conflicts:
#	app/Repositories/Account/AccountRepository.php
This commit is contained in:
James Cole
2021-05-02 06:27:32 +02:00
99 changed files with 1254 additions and 555 deletions

View File

@@ -130,6 +130,11 @@ class UpgradeDatabase extends Command
$result = Artisan::output();
echo $result;
$this->line('Fix PostgreSQL sequences.');
Artisan::call('firefly-iii:fix-pgsql-sequences');
$result = Artisan::output();
echo $result;
$this->line('Now decrypting the database (if necessary)...');
Artisan::call('firefly-iii:decrypt-all');
$result = Artisan::output();