From b7dad8166d52195960314c8c42fa1fc2162220c3 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 20:06:45 +0100 Subject: [PATCH] Auto commit for release 'v6.2.6' on 2025-02-12 --- app/Http/Controllers/Account/ShowController.php | 4 ++-- changelog.md | 14 +++++++------- composer.lock | 12 ++++++------ config/firefly.php | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index a7cea70afb..37414bde5d 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -132,8 +132,8 @@ class ShowController extends Controller $groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')])); $showAll = false; // correct - $now = today()->endOfDay(); - if($now->gt($end) || $now->lt($start)) { + $now = today()->endOfDay(); + if ($now->gt($end) || $now->lt($start)) { $now = $end; } diff --git a/changelog.md b/changelog.md index ef5a1813ca..3cd3a1ec63 100644 --- a/changelog.md +++ b/changelog.md @@ -7,13 +7,13 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed -- #9797 -- #9806 -- #9807 -- #9808 -- #9810 -- #9821 -- #9826 +- [Issue 9797](https://github.com/firefly-iii/firefly-iii/issues/9797) (All account charts show a horizontal line) reported by @avee87 +- [Issue 9806](https://github.com/firefly-iii/firefly-iii/issues/9806) (Exchange Rates table fails to load when language is not English) reported by @polter-rnd +- [Issue 9807](https://github.com/firefly-iii/firefly-iii/issues/9807) (Start Date of Reconciliation Period Incorrectly Excludes Transactions for That Day) reported by @pwschattenberg +- [Issue 9808](https://github.com/firefly-iii/firefly-iii/issues/9808) (Default financial report line graph shows a different balance than the text) reported by @mtaygur +- [Issue 9810](https://github.com/firefly-iii/firefly-iii/issues/9810) (Foreign amount not taken into consideration for budget spent/leaving) reported by @M4xS0ch +- [Issue 9821](https://github.com/firefly-iii/firefly-iii/issues/9821) (piggy events api 500 error) reported by @4e868df3 +- [Issue 9826](https://github.com/firefly-iii/firefly-iii/issues/9826) (Wrong account balance) reported by @fabienfitoussi ## 6.2.5 - 2025-02-08 diff --git a/composer.lock b/composer.lock index b57193c74c..281fb87945 100644 --- a/composer.lock +++ b/composer.lock @@ -10973,16 +10973,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.1", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" + "reference": "024473a478be9df5fdaca2c793f2232fe788e414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", + "reference": "024473a478be9df5fdaca2c793f2232fe788e414", "shasum": "" }, "require": { @@ -11021,7 +11021,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" }, "funding": [ { @@ -11029,7 +11029,7 @@ "type": "tidelift" } ], - "time": "2024-11-08T17:47:46+00:00" + "time": "2025-02-12T12:17:51+00:00" }, { "name": "nikic/php-parser", diff --git a/config/firefly.php b/config/firefly.php index 72e3181102..7eeb306c56 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -81,7 +81,7 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-02-12', + 'version' => '6.2.6', 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 25,