Merge pull request #11362 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.
Merge pull request #11361 from firefly-iii/release-1765785673
2025-12-16 11:28:50 +00:00 · 2025-12-15 09:01:26 +01:00 · 2025-12-15 09:01:21 +01:00 · 2025-12-15 09:01:13 +01:00 · 2025-12-15 08:53:14 +01:00 · 2025-12-15 08:53:05 +01:00
7 changed files with 45 additions and 32 deletions
--- a/.github/workflows/label-actions.yml
+++ b/.github/workflows/label-actions.yml
@@ -18,4 +18,4 @@ jobs:
  action:
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/label-actions@v4
+      - uses: dessant/label-actions@v5
--- a/app/Api/V1/Controllers/Summary/BasicController.php
+++ b/app/Api/V1/Controllers/Summary/BasicController.php
@@ -486,7 +486,7 @@ class BasicController extends Controller
                'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
                'value_parsed'            => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
                'local_icon'              => 'money',
-                'sub_title'               => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
+                'sub_title'               => Amount::formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, bcdiv($availableBudget, (string)$days), false),
            ];
        }
        foreach ($spent as $row) {
--- a/app/Console/Commands/Integrity/ValidatesFilePermissions.php
+++ b/app/Console/Commands/Integrity/ValidatesFilePermissions.php
@@ -55,13 +55,13 @@ class ValidatesFilePermissions extends Command
        /** @var string $directory */
        foreach ($directories as $directory) {
            if (!is_dir($directory)) {
-                $this->friendlyError(sprintf('Directory "%s" cannot found. It is necessary to allow files to be uploaded.', $uploadDir));
+                $this->friendlyError(sprintf('Directory "%s" cannot found. It is necessary to allow files to be uploaded.', $directory));
                $errors = true;

                continue;
            }
            if (!is_writable($directory)) {
-                $this->friendlyError(sprintf('Directory "%s" is not writeable. Uploading attachments may fail silently.', $uploadDir));
+                $this->friendlyError(sprintf('Directory "%s" is not writeable. Uploading attachments may fail silently.', $directory));
                $errors = true;
            }
        }
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,31 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

-## 6.4.9 - 2025-11-xx
+## v6.4.11 - 2025-12-16
+
+### Fixed
+
+- [Issue 11356](https://github.com/firefly-iii/firefly-iii/issues/11356) (Dashboard - Budget - Left To Spend "Per day" shows total budget value) reported by @lucasarrudadev
+- [Issue 11357](https://github.com/firefly-iii/firefly-iii/issues/11357) (Firefly III v6.4.10 ran into an error: Undefined variable $uploadDir.) reported by @jgmm81
+
+## v6.4.10 - 2025-12-15
+
+### Added
+
+- Added amount event audit log
+
+### Fixed
+
+- [Issue 11328](https://github.com/firefly-iii/firefly-iii/issues/11328) (Three budget / account display bugs in latest version (annual budget + account list balance)) reported by @qingxianaaa
+- [Issue 11329](https://github.com/firefly-iii/firefly-iii/issues/11329) (Imported and auto-converted transfer from different currency issue) reported by @bozho
+- [Issue 11333](https://github.com/firefly-iii/firefly-iii/issues/11333) (Prepared statement contains too many placeholders) reported by @wendyliga
+- [Issue 11313](https://github.com/firefly-iii/firefly-iii/issues/11313) (Stop Processing and Executing Rule Group on Existing Transaction) reported by @watertrainer
+- [Discussion 11323](https://github.com/orgs/firefly-iii/discussions/11323) (File ownership problem) started by @enboig
+- [Issue 11337](https://github.com/firefly-iii/firefly-iii/issues/11337) (email notifications are sent to old email address after changing it through the web UI) reported by @xsolinsx
+- [Issue 11346](https://github.com/firefly-iii/firefly-iii/issues/11346) (Running balance restart from zero for no reason) reported by @Arkarr
+- [Issue 11310](https://github.com/firefly-iii/firefly-iii/issues/11310) (Period parameter doesn't work in API) reported by @kvdb06
+
+## 6.4.9 - 2025-11-28

 ### Fixed

--- a/composer.lock
+++ b/composer.lock
@@ -12021,16 +12021,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.5.3",
+            "version": "12.5.4",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6dc2e076d09960efbb0c1272aa9bc156fc80955e"
+                "reference": "4ba0e923f9d3fc655de22f9547c01d15a41fc93a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6dc2e076d09960efbb0c1272aa9bc156fc80955e",
-                "reference": "6dc2e076d09960efbb0c1272aa9bc156fc80955e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4ba0e923f9d3fc655de22f9547c01d15a41fc93a",
+                "reference": "4ba0e923f9d3fc655de22f9547c01d15a41fc93a",
                "shasum": ""
            },
            "require": {
@@ -12098,7 +12098,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.3"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.4"
            },
            "funding": [
                {
@@ -12122,7 +12122,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-11T08:52:59+00:00"
+            "time": "2025-12-15T06:05:34+00:00"
        },
        {
            "name": "rector/rector",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -78,8 +78,8 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                              => 'develop/2025-12-14',
-    'build_time'                           => 1765725141,
+    'version'                              => '6.4.11',
+    'build_time'                           => 1765785566,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.

--- a/package-lock.json
+++ b/package-lock.json
@@ -3910,9 +3910,9 @@
            "license": "MIT"
        },
        "node_modules/autoprefixer": {
-            "version": "10.4.22",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.22.tgz",
-            "integrity": "sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==",
+            "version": "10.4.23",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.23.tgz",
+            "integrity": "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==",
            "dev": true,
            "funding": [
                {
@@ -3930,10 +3930,9 @@
            ],
            "license": "MIT",
            "dependencies": {
-                "browserslist": "^4.27.0",
-                "caniuse-lite": "^1.0.30001754",
+                "browserslist": "^4.28.1",
+                "caniuse-lite": "^1.0.30001760",
                "fraction.js": "^5.3.4",
-                "normalize-range": "^0.1.2",
                "picocolors": "^1.1.1",
                "postcss-value-parser": "^4.2.0"
            },
@@ -7052,9 +7051,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "25.7.2",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.7.2.tgz",
-            "integrity": "sha512-58b4kmLpLv1buWUEwegMDUqZVR5J+rT+WTRFaBGL7lxDuJQQ0NrJFrq+eT2N94aYVR1k1Sr13QITNOL88tZCuw==",
+            "version": "25.7.3",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.7.3.tgz",
+            "integrity": "sha512-2XaT+HpYGuc2uTExq9TVRhLsso+Dxym6PWaKpn36wfBmTI779OQ7iP/XaZHzrnGyzU4SHpFrTYLKfVyBfAhVNA==",
            "funding": [
                {
                    "type": "individual",
@@ -8429,16 +8428,6 @@
                "node": ">=0.10.0"
            }
        },
-        "node_modules/normalize-range": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
        "node_modules/normalize-url": {
            "version": "6.1.0",
            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
Author	SHA1	Message	Date
github-actions[bot]	f475947776	Merge pull request #11362 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-12-15 09:01:26 +01:00
github-actions[bot]	ee6901eb92	Merge pull request #11361 from firefly-iii/release-1765785673 🤖 Automatically merge the PR into the develop branch.	2025-12-15 09:01:21 +01:00
JC5	84d7523d6c	🤖 Auto commit for release 'v6.4.11' on 2025-12-15	2025-12-15 09:01:13 +01:00
github-actions[bot]	6900dc7dae	Merge pull request #11360 from firefly-iii/release-1765785184 🤖 Automatically merge the PR into the develop branch.	2025-12-15 08:53:14 +01:00
JC5	6247e516c6	🤖 Auto commit for release 'develop' on 2025-12-15	2025-12-15 08:53:05 +01:00
Sander Dorigo	cdf970a88c	Add changelog	2025-12-15 08:42:10 +01:00
Sander Dorigo	a447c387f9	Fix #11357	2025-12-15 08:41:07 +01:00
Sander Dorigo	ce2c94efed	Fix #11356	2025-12-15 08:40:19 +01:00
James Cole	205ea4270b	Merge pull request #11358 from firefly-iii/dependabot/github_actions/dessant/label-actions-5	2025-12-15 07:27:43 +01:00
github-actions[bot]	dcbb2428f2	Merge pull request #11359 from firefly-iii/release-1765769737 🤖 Automatically merge the PR into the develop branch.	2025-12-15 04:35:45 +01:00
JC5	319916fc8f	🤖 Auto commit for release 'develop' on 2025-12-15	2025-12-15 04:35:37 +01:00
dependabot[bot]	088b0e2f30	Bump dessant/label-actions from 4 to 5 Bumps [dessant/label-actions](https://github.com/dessant/label-actions) from 4 to 5. - [Release notes](https://github.com/dessant/label-actions/releases) - [Changelog](https://github.com/dessant/label-actions/blob/main/CHANGELOG.md) - [Commits](https://github.com/dessant/label-actions/compare/v4...v5) --- updated-dependencies: - dependency-name: dessant/label-actions dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-12-15 03:06:09 +00:00
github-actions[bot]	b45aadf8a3	Merge pull request #11355 from firefly-iii/develop 🤖 Automatically merge the PR into the main branch.	2025-12-14 19:13:25 +01:00
github-actions[bot]	1fafeb1515	Merge pull request #11354 from firefly-iii/release-1765735989 🤖 Automatically merge the PR into the develop branch.	2025-12-14 19:13:19 +01:00
JC5	f60c64c9c1	🤖 Auto commit for release 'v6.4.10' on 2025-12-14	2025-12-14 19:13:09 +01:00
James Cole	564dcb1c6d	Expand changelog.	2025-12-14 19:09:08 +01:00