kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10366 from firefly-iii/develop

Browse Source 
🤖 Automatically merge the PR into the main branch.
This commit is contained in:
github-actions[bot]
2025-05-25 07:11:22 +02:00
committed by GitHub
parent 659240a98b 605ab38660
commit 1fae39a49d
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
config/app.php
View File

@@ -41,6 +41,11 @@ use FireflyIII\Providers\RuleServiceProvider;
use FireflyIII\Providers\SearchServiceProvider; use FireflyIII\Providers\SearchServiceProvider;
use FireflyIII\Providers\SessionServiceProvider; use FireflyIII\Providers\SessionServiceProvider;
use FireflyIII\Providers\TagServiceProvider; use FireflyIII\Providers\TagServiceProvider;
use FireflyIII\Support\Facades\AccountForm;
use FireflyIII\Support\Facades\CurrencyForm;
use FireflyIII\Support\Facades\ExpandedForm;
use FireflyIII\Support\Facades\PiggyBankForm;
use FireflyIII\Support\Facades\RuleForm;
use Illuminate\Auth\AuthServiceProvider; use Illuminate\Auth\AuthServiceProvider;
use Illuminate\Auth\Passwords\PasswordResetServiceProvider; use Illuminate\Auth\Passwords\PasswordResetServiceProvider;
use Illuminate\Broadcasting\BroadcastServiceProvider; use Illuminate\Broadcasting\BroadcastServiceProvider;
@@ -59,13 +64,16 @@ use Illuminate\Pagination\PaginationServiceProvider;
use Illuminate\Pipeline\PipelineServiceProvider; use Illuminate\Pipeline\PipelineServiceProvider;
use Illuminate\Queue\QueueServiceProvider; use Illuminate\Queue\QueueServiceProvider;
use Illuminate\Redis\RedisServiceProvider; use Illuminate\Redis\RedisServiceProvider;
use Illuminate\Translation\TranslationServiceProvider;
use Illuminate\Validation\ValidationServiceProvider;
use Illuminate\View\ViewServiceProvider;
use TwigBridge\ServiceProvider;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\URL;
use Illuminate\Translation\TranslationServiceProvider;
use Illuminate\Validation\ValidationServiceProvider;
use Illuminate\View\ViewServiceProvider;
use Spatie\Html\Facades\Html;
use TwigBridge\ServiceProvider;
return [ return [
'name' => envNonEmpty('APP_NAME', 'Firefly III'), 'name' => envNonEmpty('APP_NAME', 'Firefly III'),
@@ -133,9 +141,17 @@ return [
RecurringServiceProvider::class, RecurringServiceProvider::class,
], ],
'aliases' => [ 'aliases' => [
'Auth' => Auth::class, 'Auth' => Auth::class,
'Route' => Route::class, 'Route' => Route::class,
'Config' => Config::class, 'Config' => Config::class,
'Session' => Session::class,
'URL' => URL::class,
'Html' => Html::class,
'AccountForm' => AccountForm::class,
'CurrencyForm' => CurrencyForm::class,
'ExpandedForm' => ExpandedForm::class,
'PiggyBankForm' => PiggyBankForm::class,
'RuleForm' => RuleForm::class,
], ],
'asset_url' => env('ASSET_URL', null), 'asset_url' => env('ASSET_URL', null),

2
config/firefly.php
View File

@@ -78,7 +78,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.2.14', 'version' => '6.2.15',
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 25, 'db_version' => 25,