Merge pull request #11043 from firefly-iii/release-1760095977

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2025-10-10
2026-01-18 20:04:57 +00:00 · 2025-10-10 13:33:06 +02:00 · 2025-10-10 13:32:57 +02:00 · 2025-10-10 13:28:56 +02:00 · 2025-10-10 13:18:47 +02:00 · 2025-10-10 08:58:18 +02:00
7 changed files with 43 additions and 27 deletions
--- a/THANKS.md
+++ b/THANKS.md
@@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.

 ## 2025
+- jreyesr
 - codearena-bot
 - Nicky De Maeyer
 - Denis Iskandarov
--- a/app/Factory/PiggyBankEventFactory.php
+++ b/app/Factory/PiggyBankEventFactory.php
@@ -26,6 +26,7 @@ namespace FireflyIII\Factory;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use Illuminate\Support\Facades\Log;

 /**
 * Create piggy bank events.
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -81,6 +81,12 @@ class ReconcileController extends Controller
        if (!$start instanceof Carbon && !$end instanceof Carbon) {
            throw new FireflyException('Invalid dates submitted.');
        }
+        if (!is_numeric($startBalance)) {
+            $startBalance = '0';
+        }
+        if (!is_numeric($endBalance)) {
+            $endBalance = '0';
+        }
        if ($end->lt($start)) {
            [$start, $end] = [$end, $start];
        }
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -420,6 +420,7 @@ class Navigation
            'week'     => (string)trans('config.week_in_year_js'),
            'weekly'   => (string)trans('config.week_in_year_js'),
            '1M'       => (string)trans('config.month_js'),
+            'MTD'      => (string)trans('config.month_js'),
            'month'    => (string)trans('config.month_js'),
            'monthly'  => (string)trans('config.month_js'),
            '1Y'       => (string)trans('config.year_js'),
@@ -427,6 +428,11 @@ class Navigation
            'year'     => (string)trans('config.year_js'),
            'yearly'   => (string)trans('config.year_js'),
            '6M'       => (string)trans('config.half_year_js'),
+            'last7'    => (string)trans('config.specific_day_js'),
+            'last30'   => (string)trans('config.month_js'),
+            'last90'   => (string)trans('config.month_js'),
+            'last365'  => (string)trans('config.year_js'),
+            'QTD'      => (string)trans('config.month_js'),
        ];

        if (array_key_exists($repeatFrequency, $formatMap)) {
--- a/composer.lock
+++ b/composer.lock
@@ -11815,16 +11815,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "12.4.0",
+            "version": "12.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f62aab5794e36ccd26860db2d1bbf89ac19028d9"
+                "reference": "fc5413a2e6d240d2f6d9317bdf7f0a24e73de194"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f62aab5794e36ccd26860db2d1bbf89ac19028d9",
-                "reference": "f62aab5794e36ccd26860db2d1bbf89ac19028d9",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc5413a2e6d240d2f6d9317bdf7f0a24e73de194",
+                "reference": "fc5413a2e6d240d2f6d9317bdf7f0a24e73de194",
                "shasum": ""
            },
            "require": {
@@ -11892,7 +11892,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.4.0"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.4.1"
            },
            "funding": [
                {
@@ -11916,20 +11916,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-10-03T04:28:03+00:00"
+            "time": "2025-10-09T14:08:29+00:00"
        },
        {
            "name": "rector/rector",
-            "version": "2.2.1",
+            "version": "2.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/rectorphp/rector.git",
-                "reference": "e1aaf3061e9ae9342ed0824865e3a3360defddeb"
+                "reference": "5b353f7457b9a0c63fc91ef340f5d119a40991ed"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/e1aaf3061e9ae9342ed0824865e3a3360defddeb",
-                "reference": "e1aaf3061e9ae9342ed0824865e3a3360defddeb",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/5b353f7457b9a0c63fc91ef340f5d119a40991ed",
+                "reference": "5b353f7457b9a0c63fc91ef340f5d119a40991ed",
                "shasum": ""
            },
            "require": {
@@ -11968,7 +11968,7 @@
            ],
            "support": {
                "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.2.1"
+                "source": "https://github.com/rectorphp/rector/tree/2.2.2"
            },
            "funding": [
                {
@@ -11976,7 +11976,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-10-06T21:25:14+00:00"
+            "time": "2025-10-09T19:50:20+00:00"
        },
        {
            "name": "sebastian/cli-parser",
--- 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-10-09',
-    'build_time'                   => 1759999856,
+    'version'                      => 'develop/2025-10-10',
+    'build_time'                   => 1760095871,
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 28, // field is no longer used.

@@ -225,6 +225,8 @@ return [
        // plain files
        'text/plain',
        'text/html',
+        'text/xml',
+        'application/xml',

        // images
        'image/jpeg',
--- a/package-lock.json
+++ b/package-lock.json
@@ -3173,9 +3173,9 @@
            "license": "MIT"
        },
        "node_modules/@types/node": {
-            "version": "24.7.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.0.tgz",
-            "integrity": "sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==",
+            "version": "24.7.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.1.tgz",
+            "integrity": "sha512-CmyhGZanP88uuC5GpWU9q+fI61j2SkhO3UGMUdfYRE6Bcy0ccyzn1Rqj9YAB/ZY4kOXmNf0ocah5GtphmLMP6Q==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -4075,9 +4075,9 @@
            "license": "MIT"
        },
        "node_modules/baseline-browser-mapping": {
-            "version": "2.8.14",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.14.tgz",
-            "integrity": "sha512-GM9c0cWWR8Ga7//Ves/9KRgTS8nLausCkP3CGiFLrnwA2CDUluXgaQqvrULoR2Ujrd/mz/lkX87F5BHFsNr5sQ==",
+            "version": "2.8.15",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.15.tgz",
+            "integrity": "sha512-qsJ8/X+UypqxHXN75M7dF88jNK37dLBRW7LeUzCPz+TNs37G8cfWy9nWzS+LS//g600zrt2le9KuXt0rWfDz5Q==",
            "dev": true,
            "license": "Apache-2.0",
            "bin": {
@@ -4966,13 +4966,13 @@
            "license": "MIT"
        },
        "node_modules/core-js-compat": {
-            "version": "3.45.1",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz",
-            "integrity": "sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==",
+            "version": "3.46.0",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.46.0.tgz",
+            "integrity": "sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "browserslist": "^4.25.3"
+                "browserslist": "^4.26.3"
            },
            "funding": {
                "type": "opencollective",
@@ -5736,9 +5736,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.233",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.233.tgz",
-            "integrity": "sha512-iUdTQSf7EFXsDdQsp8MwJz5SVk4APEFqXU/S47OtQ0YLqacSwPXdZ5vRlMX3neb07Cy2vgioNuRnWUXFwuslkg==",
+            "version": "1.5.234",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.234.tgz",
+            "integrity": "sha512-RXfEp2x+VRYn8jbKfQlRImzoJU01kyDvVPBmG39eU2iuRVhuS6vQNocB8J0/8GrIMLnPzgz4eW6WiRnJkTuNWg==",
            "dev": true,
            "license": "ISC"
        },
Author	SHA1	Message	Date
github-actions[bot]	c91c87d646	Merge pull request #11043 from firefly-iii/release-1760095977 🤖 Automatically merge the PR into the develop branch.	2025-10-10 13:33:06 +02:00
JC5	e09b6034f7	🤖 Auto commit for release 'develop' on 2025-10-10	2025-10-10 13:32:57 +02:00
Sander Dorigo	a88d0de34d	Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop	2025-10-10 13:28:56 +02:00
Sander Dorigo	ecf498cc81	Add more options	2025-10-10 13:18:47 +02:00
James Cole	7d45bc46b8	Merge pull request #11041 from jreyesr/patch-1 Add XML mimetypes to the allowedMimes list	2025-10-10 08:58:18 +02:00
mergify[bot]	08553fcfb2	Merge branch 'develop' into patch-1	2025-10-10 06:47:30 +00:00
mergify[bot]	3fa1b6dd27	Merge branch 'develop' into patch-1	2025-10-10 06:46:54 +00:00
Sander Dorigo	63aa8adab7	Import forgotten class	2025-10-10 08:46:47 +02:00
Sander Dorigo	70b8ea0acb	Basic check on numbers, needs improv still.	2025-10-10 08:46:11 +02:00
jreyesr	d800a01e33	Add XML mimetypes to the allowedMimes list Signed-off-by: jreyesr <jreyesr@users.noreply.github.com>	2025-10-09 15:40:07 -05:00
Sander Dorigo	d4978a09ee	Fix #11038	2025-10-09 12:35:51 +02:00