kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into adminlte4

Browse Source
This commit is contained in:
James Cole
2023-08-11 19:43:18 +02:00
parent 27d07d5807 4c90f66578
commit daf753d76e
144 changed files with 1641 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/firefly.php
View File

@@ -86,6 +86,7 @@ use FireflyIII\TransactionRules\Actions\SetDescription;
use FireflyIII\TransactionRules\Actions\SetDestinationAccount;
use FireflyIII\TransactionRules\Actions\SetNotes;
use FireflyIII\TransactionRules\Actions\SetSourceAccount;
use FireflyIII\TransactionRules\Actions\SwitchAccounts;
use FireflyIII\TransactionRules\Actions\UpdatePiggybank;
use FireflyIII\User;
@@ -111,7 +112,7 @@ return [
],
'version' => '6.0.20',
'api_version' => '2.0.5',
'db_version' => 19,
'db_version' => 20,
// generic settings
'maxUploadSize' => 1073741824, // 1 GB
@@ -503,6 +504,7 @@ return [
'convert_withdrawal' => ConvertToWithdrawal::class,
'convert_deposit' => ConvertToDeposit::class,
'convert_transfer' => ConvertToTransfer::class,
'switch_accounts' => SwitchAccounts::class,
'update_piggy' => UpdatePiggybank::class,
'delete_transaction' => DeleteTransaction::class,
'append_descr_to_notes' => AppendDescriptionToNotes::class,