Auto commit for release 'develop' on 2024-12-18

Auto commit for release 'v6.1.25' on 2024-12-18
Update changelog.
2025-10-27 22:00:47 +00:00 · 2024-12-18 16:52:40 +01:00 · 2024-12-18 16:36:08 +01:00 · 2024-12-18 16:31:37 +01:00 · 2024-12-18 16:29:19 +01:00 · 2024-12-18 16:26:35 +01:00
8 changed files with 177 additions and 107 deletions
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -13,7 +13,7 @@ jobs:
  close_duplicates:
    runs-on: ubuntu-latest
    steps:
-      - uses: github/command@v1.2.2
+      - uses: github/command@v1.3.0
        id: command
        with:
          allowed_contexts: "issue"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,9 +4,13 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        description: 'Release "v1.2.3" or "develop"'
+        description: 'Release "v1.2.3" or "develop" or "branch-abc"'
        required: true
        default: 'develop'
+      phpversion:
+        description: 'PHP version'
+        required: true
+        default: '8.3'
  schedule:
    - cron: '0 3 * * MON'

@@ -23,6 +27,11 @@ jobs:
          if [[ "develop" == "$version" ]]; then
            git checkout --track origin/develop
            git pull
+          elif [[ "$version" == branch* ]]; then
+            PULLBRANCH=${version:7}
+            echo "The branch is '$PULLBRANCH' ($version)"
+            git checkout --track origin/$PULLBRANCH
+            git pull
          else
            git config user.name github-actions
            git config user.email 41898282+github-actions[bot]@users.noreply.github.com
@@ -36,7 +45,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: '8.3'
+          php-version: ${{ github.event.inputs.phpversion }}
          extensions: mbstring, intl, zip, bcmath
      - name: crowdin action
        uses: crowdin/github-action@v2
@@ -133,7 +142,7 @@ jobs:
          rm -rf vendor composer.lock
          composer update --no-dev --no-scripts --no-plugins -q
          sudo chown -R runner:docker resources/lang
-          .ci/phpcs.sh
+          .ci/phpcs.sh || true
      - name: Import GPG key
        uses: crazy-max/ghaction-import-gpg@v6
        with:
@@ -166,6 +175,16 @@ jobs:
            tarName=FireflyIII-develop.tar.gz
          fi

+          # if this is a branch build, also slightly different variable names.
+          if [[ "$version" == branch* ]]; then
+            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            # branch builds overrule develop
+            releaseName=$version-$(date +'%Y%m%d')
+            originalName=$releaseName
+            zipName=FireflyIII-$version.zip
+            tarName=FireflyIII-$version.tar.gz
+          fi
+
          # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
          tagFound=true
          tagCount=1
@@ -207,12 +226,13 @@ jobs:
          gpg --armor --detach-sign $zipName
          gpg --armor --detach-sign $tarName

-          # create a development (nightly) release:
+          # describe the development release.
          if [[ "develop" == "$version" ]]; then
            echo 'Develop release.'
-            # add text to output.txt (instructions)
            rm output.txt
-            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
            echo "" >> output.txt
            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo "" >> output.txt
@@ -220,15 +240,62 @@ jobs:
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
            echo "" >> output.txt
            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe a branch release
+          if [[ "$version" == branch* ]]; then
+            echo 'Branch release.'
+            rm output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe the main release
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
+            sudo chown -R runner:docker output.txt
+            echo 'Main release.'
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt

+          fi
+
+          # create a development release:
+          if [[ "develop" == "$version" ]]; then
            # create the release:
-            echo "Create nightly release."
-            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            echo "Create develop release."
+            git tag -a $releaseName -m "Development release '$version' on $(date +'%Y-%m-%d')"
+
            git push origin $releaseName
            gh release create $releaseName -p --verify-tag \
              -t "Development release for $(date +'%Y-%m-%d')" \
              -F output.txt
+          fi

+          # create a branch release:
+          if [[ "$version" == branch* ]]; then
+
+            # create the release:
+            echo "Create branch release."
+            git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')"
+
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Branch release for $(date +'%Y-%m-%d')" \
+              -F output.txt
+          fi
+
+          # create a development (nightly) release:
+          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
            # add zip file to release.
            gh release upload $releaseName $zipName
            gh release upload $releaseName $tarName
@@ -247,16 +314,6 @@ jobs:
            gh release upload $releaseName HEAD.txt
          else
            echo 'MAIN (real) release'
-            sudo chown -R runner:docker output.txt
-            # add text to output.txt (more instructions)
-            echo '' >> output.txt
-            echo '### Instructions' >> output.txt
-            echo '' >> output.txt
-            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
-            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
-            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
-
-            echo "Create default release."
            git tag -a $releaseName -m "Here be changelog"
            git push origin $releaseName
            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
--- a/app/Handlers/Observer/TransactionObserver.php
+++ b/app/Handlers/Observer/TransactionObserver.php
@@ -41,18 +41,22 @@ class TransactionObserver
    public function updated(Transaction $transaction): void
    {
        Log::debug('Observe "updated" of a transaction.');
-        if (1 === bccomp($transaction->amount, '0')) {
-            Log::debug('Trigger recalculateForJournal');
-            AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+        if (config('firefly.feature_flags.running_balance_column')) {
+            if (1 === bccomp($transaction->amount, '0')) {
+                Log::debug('Trigger recalculateForJournal');
+                AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+            }
        }
    }

    public function created(Transaction $transaction): void
    {
        Log::debug('Observe "created" of a transaction.');
-        if (1 === bccomp($transaction->amount, '0')) {
-            Log::debug('Trigger recalculateForJournal');
-            AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+        if (config('firefly.feature_flags.running_balance_column')) {
+            if (1 === bccomp($transaction->amount, '0')) {
+                Log::debug('Trigger recalculateForJournal');
+                AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+            }
        }
    }
 }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.1.25 - 2024-12-19
+
+### Fixed
+
+- [Issue 9492](https://github.com/firefly-iii/firefly-iii/issues/9492) (API: `PUT /api/v1/transactions/ID` does not work with only `source_name`) reported by @dreautall
+- [Issue 9497](https://github.com/firefly-iii/firefly-iii/issues/9497) ('Attempt to read property "user" on null' error when running `php artisan firefly-iii:upgrade-database` on updating to v6.1.24) reported by @ChrisCarini
+- [Discussion 9546](https://github.com/orgs/firefly-iii/discussions/9546) (Using the Data Importer to import data is very slowly？) started by @shangyuok
+
 ## 6.1.24 - 2024-11-24

 ### Fixed
--- a/composer.lock
+++ b/composer.lock
@@ -1809,20 +1809,20 @@
            },
            "type": "library",
            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
+                    },
+                    "providers": [
+                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
+                    ]
+                },
                "component": "package",
                "frameworks": [
                    "Laravel"
                ],
                "branch-alias": {
                    "dev-master": "0.2-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "PragmaRX\\Google2FALaravel\\ServiceProvider"
-                    ],
-                    "aliases": {
-                        "Google2FA": "PragmaRX\\Google2FALaravel\\Facade"
-                    }
                }
            },
            "autoload": {
@@ -2548,16 +2548,16 @@
        },
        {
            "name": "laravel/framework",
-            "version": "v11.35.1",
+            "version": "v11.36.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/framework.git",
-                "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb"
+                "reference": "df06f5163f4550641fdf349ebc04916a61135a64"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/dcfa130ede1a6fa4343dc113410963e791ad34fb",
-                "reference": "dcfa130ede1a6fa4343dc113410963e791ad34fb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64",
+                "reference": "df06f5163f4550641fdf349ebc04916a61135a64",
                "shasum": ""
            },
            "require": {
@@ -2578,7 +2578,7 @@
                "guzzlehttp/uri-template": "^1.0",
                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                "laravel/serializable-closure": "^1.3|^2.0",
-                "league/commonmark": "^2.2.1",
+                "league/commonmark": "^2.6",
                "league/flysystem": "^3.25.1",
                "league/flysystem-local": "^3.25.1",
                "league/uri": "^7.5.1",
@@ -2593,7 +2593,7 @@
                "symfony/console": "^7.0.3",
                "symfony/error-handler": "^7.0.3",
                "symfony/finder": "^7.0.3",
-                "symfony/http-foundation": "^7.0.3",
+                "symfony/http-foundation": "^7.2.0",
                "symfony/http-kernel": "^7.0.3",
                "symfony/mailer": "^7.0.3",
                "symfony/mime": "^7.0.3",
@@ -2759,7 +2759,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2024-12-12T18:25:58+00:00"
+            "time": "2024-12-17T22:32:08+00:00"
        },
        {
            "name": "laravel/passport",
@@ -2898,16 +2898,16 @@
        },
        {
            "name": "laravel/sanctum",
-            "version": "v4.0.6",
+            "version": "v4.0.7",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/sanctum.git",
-                "reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694"
+                "reference": "698064236a46df016e64a7eb059b1414e0b281df"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9e069e36d90b1e1f41886efa0fe9800a6b354694",
-                "reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/698064236a46df016e64a7eb059b1414e0b281df",
+                "reference": "698064236a46df016e64a7eb059b1414e0b281df",
                "shasum": ""
            },
            "require": {
@@ -2958,20 +2958,20 @@
                "issues": "https://github.com/laravel/sanctum/issues",
                "source": "https://github.com/laravel/sanctum"
            },
-            "time": "2024-11-26T21:18:33+00:00"
+            "time": "2024-12-11T16:40:21+00:00"
        },
        {
            "name": "laravel/serializable-closure",
-            "version": "v2.0.0",
+            "version": "v2.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "0d8d3d8086984996df86596a86dea60398093a81"
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/0d8d3d8086984996df86596a86dea60398093a81",
-                "reference": "0d8d3d8086984996df86596a86dea60398093a81",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
                "shasum": ""
            },
            "require": {
@@ -3019,7 +3019,7 @@
                "issues": "https://github.com/laravel/serializable-closure/issues",
                "source": "https://github.com/laravel/serializable-closure"
            },
-            "time": "2024-11-19T01:38:44+00:00"
+            "time": "2024-12-16T15:26:28+00:00"
        },
        {
            "name": "laravel/slack-notification-channel",
@@ -3477,16 +3477,16 @@
        },
        {
            "name": "league/csv",
-            "version": "9.20.0",
+            "version": "9.20.1",
            "source": {
                "type": "git",
                "url": "https://github.com/thephpleague/csv.git",
-                "reference": "553579df208641ada6ffb450b3a151e2fcfa4f31"
+                "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/csv/zipball/553579df208641ada6ffb450b3a151e2fcfa4f31",
-                "reference": "553579df208641ada6ffb450b3a151e2fcfa4f31",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/491d1e79e973a7370c7571dc0fe4a7241f4936ee",
+                "reference": "491d1e79e973a7370c7571dc0fe4a7241f4936ee",
                "shasum": ""
            },
            "require": {
@@ -3560,7 +3560,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-12-13T15:49:27+00:00"
+            "time": "2024-12-18T10:11:15+00:00"
        },
        {
            "name": "league/event",
@@ -6894,12 +6894,12 @@
            "type": "library",
            "extra": {
                "laravel": {
-                    "providers": [
-                        "Spatie\\Html\\HtmlServiceProvider"
-                    ],
                    "aliases": {
                        "Html": "Spatie\\Html\\Facades\\Html"
-                    }
+                    },
+                    "providers": [
+                        "Spatie\\Html\\HtmlServiceProvider"
+                    ]
                }
            },
            "autoload": {
@@ -10537,16 +10537,16 @@
        },
        {
            "name": "barryvdh/laravel-ide-helper",
-            "version": "v3.2.2",
+            "version": "v3.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "07e3bd8796f3d1414801a03d3783f9d3ec9efc08"
+                "reference": "b7675670f75914bf34afdea52a6c2fe3781f7c44"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/07e3bd8796f3d1414801a03d3783f9d3ec9efc08",
-                "reference": "07e3bd8796f3d1414801a03d3783f9d3ec9efc08",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/b7675670f75914bf34afdea52a6c2fe3781f7c44",
+                "reference": "b7675670f75914bf34afdea52a6c2fe3781f7c44",
                "shasum": ""
            },
            "require": {
@@ -10615,7 +10615,7 @@
            ],
            "support": {
                "issues": "https://github.com/barryvdh/laravel-ide-helper/issues",
-                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.2.2"
+                "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v3.3.0"
            },
            "funding": [
                {
@@ -10627,7 +10627,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-10-29T14:00:16+00:00"
+            "time": "2024-12-18T08:24:19+00:00"
        },
        {
            "name": "barryvdh/reflection-docblock",
@@ -11960,16 +11960,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "1.12.12",
+            "version": "1.12.13",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
+                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
-                "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9b469068840cfa031e1deaf2fa1886d00e20680f",
+                "reference": "9b469068840cfa031e1deaf2fa1886d00e20680f",
                "shasum": ""
            },
            "require": {
@@ -12014,7 +12014,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-11-28T22:13:23+00:00"
+            "time": "2024-12-17T17:00:20+00:00"
        },
        {
            "name": "phpstan/phpstan-deprecation-rules",
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -110,7 +110,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-'version' => 'develop/2024-12-16',
+    'version'                      => 'develop/2024-12-18',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
@@ -44,9 +44,9 @@
            }
        },
        "node_modules/@ag-grid-community/styles": {
-            "version": "32.3.3",
-            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-32.3.3.tgz",
-            "integrity": "sha512-QAJc1CPbmFsAAq5M/8r0IOm8HL4Fb3eVK6tZXKzV9zibIereBjUwvvJRaSJa8iwtTlgxCtaULAQyE2gJcctphA==",
+            "version": "33.0.2",
+            "resolved": "https://registry.npmjs.org/@ag-grid-community/styles/-/styles-33.0.2.tgz",
+            "integrity": "sha512-oMUdolN8l34k6ubLQm3AiO53SqB59YbPDSanVDrwiN7xIq5NGczVQ2Yks032XWqa0bMYkLU9L9opCBSCwZdKsg==",
            "license": "MIT"
        },
        "node_modules/@ampproject/remapping": {
@@ -2117,9 +2117,9 @@
            }
        },
        "node_modules/@fortawesome/fontawesome-free": {
-            "version": "6.7.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.1.tgz",
-            "integrity": "sha512-ALIk/MOh5gYe1TG/ieS5mVUsk7VUIJTJKPMK9rFFqOgfp0Q3d5QiBXbcOMwUvs37fyZVCz46YjOE6IFeOAXCHA==",
+            "version": "6.7.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+            "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
            "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
            "engines": {
                "node": ">=6"
@@ -4431,9 +4431,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001688",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz",
-            "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==",
+            "version": "1.0.30001689",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz",
+            "integrity": "sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==",
            "dev": true,
            "funding": [
                {
@@ -4501,9 +4501,9 @@
            }
        },
        "node_modules/chartjs-chart-sankey": {
-            "version": "0.13.0",
-            "resolved": "https://registry.npmjs.org/chartjs-chart-sankey/-/chartjs-chart-sankey-0.13.0.tgz",
-            "integrity": "sha512-RnmdWdVHj6vlwBsUfdxdO4LCguhzaUplun3Goudva4AgSCkicKS8Zt/gPQWi2i/FmBTYIOuNoYe6GtY+xleJiA==",
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/chartjs-chart-sankey/-/chartjs-chart-sankey-0.14.0.tgz",
+            "integrity": "sha512-MrU3lE73TE9kALy4MjWFlfcwf4R1EN/DBvhHxmv9n4AHap//JLKjlJTLIZwHsUjDsYo0B8PuMkrJODwfirEZUA==",
            "license": "MIT",
            "peerDependencies": {
                "chart.js": ">=3.3.0"
@@ -5624,13 +5624,13 @@
            "license": "BSD-2-Clause"
        },
        "node_modules/dunder-proto": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.0.tgz",
-            "integrity": "sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+            "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "call-bind-apply-helpers": "^1.0.0",
+                "call-bind-apply-helpers": "^1.0.1",
                "es-errors": "^1.3.0",
                "gopd": "^1.2.0"
            },
@@ -5646,9 +5646,9 @@
            "license": "MIT"
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.5.73",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz",
-            "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==",
+            "version": "1.5.74",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz",
+            "integrity": "sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==",
            "dev": true,
            "license": "ISC"
        },
@@ -6932,9 +6932,9 @@
            }
        },
        "node_modules/i18next": {
-            "version": "24.1.0",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.1.0.tgz",
-            "integrity": "sha512-suKlX82AlptkMUO5YRfaAeH4FQyyKvR66jNaubTMiyPPMx7INU6PXAiy3PGULc0q6K+t9nxmDf/TRj9KjAivmw==",
+            "version": "24.1.2",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.1.2.tgz",
+            "integrity": "sha512-th/075GW0Ub1gYDMHLiZXMGSfGv1aP1VqjT3fma/12hNHCNlH8oJMftvlDzycT/R+KoULWk+xLU8H1JRwV85qw==",
            "funding": [
                {
                    "type": "individual",
@@ -7442,13 +7442,14 @@
            "license": "MIT"
        },
        "node_modules/json-stable-stringify": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz",
-            "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.0.tgz",
+            "integrity": "sha512-ex8jk9BZHBolvbd5cRnAgwyaYcYB0qZldy1e+LCOdcF6+AUmVZ6LcGUMzsRTW83QMeu+GxZGrcLqxqrgfXGvIw==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
-                "call-bind": "^1.0.5",
+                "call-bind": "^1.0.8",
+                "call-bound": "^1.0.3",
                "isarray": "^2.0.5",
                "jsonify": "^0.0.1",
                "object-keys": "^1.1.1"
@@ -7808,9 +7809,9 @@
            }
        },
        "node_modules/magic-string": {
-            "version": "0.30.15",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.15.tgz",
-            "integrity": "sha512-zXeaYRgZ6ldS1RJJUrMrYgNJ4fdwnyI6tVqoiIhyCyv5IVTK9BU8Ic2l253GGETQHxI4HNUwhJ3fjDhKqEoaAw==",
+            "version": "0.30.17",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+            "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -10050,9 +10051,9 @@
            }
        },
        "node_modules/sass/node_modules/chokidar": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-            "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.2.tgz",
+            "integrity": "sha512-/b57FK+bblSU+dfewfFe0rT1YjVDfOmeLQwCAuC+vwvgLkXboATqqmy+Ipux6JrF6L5joe5CBnFOw+gLWH6yKg==",
            "dev": true,
            "license": "MIT",
            "dependencies": {
@@ -12159,7 +12160,7 @@
                "@ag-grid-community/client-side-row-model": "^32.0.2",
                "@ag-grid-community/core": "^32.0.2",
                "@ag-grid-community/infinite-row-model": "^32.0.2",
-                "@ag-grid-community/styles": "^32.0.0",
+                "@ag-grid-community/styles": "^33.0.2",
                "@fortawesome/fontawesome-free": "^6.4.0",
                "@popperjs/core": "^2.11.8",
                "admin-lte": "^4.0.0-alpha3",
@@ -12169,7 +12170,7 @@
                "bootstrap5-tags": "^1.7",
                "chart.js": "^4.4.0",
                "chartjs-adapter-date-fns": "^3.0.0",
-                "chartjs-chart-sankey": "^0.13.0",
+                "chartjs-chart-sankey": "^0.14.0",
                "date-fns": "^4.0.0",
                "i18next": "^24.0.0",
                "i18next-chained-backend": "^4.6.2",
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -19,7 +19,7 @@
        "@ag-grid-community/client-side-row-model": "^32.0.2",
        "@ag-grid-community/core": "^32.0.2",
        "@ag-grid-community/infinite-row-model": "^32.0.2",
-        "@ag-grid-community/styles": "^32.0.0",
+        "@ag-grid-community/styles": "^33.0.2",
        "@fortawesome/fontawesome-free": "^6.4.0",
        "@popperjs/core": "^2.11.8",
        "admin-lte": "^4.0.0-alpha3",
@@ -29,7 +29,7 @@
        "bootstrap5-tags": "^1.7",
        "chart.js": "^4.4.0",
        "chartjs-adapter-date-fns": "^3.0.0",
-        "chartjs-chart-sankey": "^0.13.0",
+        "chartjs-chart-sankey": "^0.14.0",
        "date-fns": "^4.0.0",
        "i18next": "^24.0.0",
        "i18next-chained-backend": "^4.6.2",
Author	SHA1	Message	Date
github-actions	e2f1fc307f	Auto commit for release 'develop' on 2024-12-18	2024-12-18 16:52:40 +01:00
github-actions	fe6021a3d6	Auto commit for release 'v6.1.25' on 2024-12-18	2024-12-18 16:36:08 +01:00
James Cole	563c54702b	Update changelog.	2024-12-18 16:31:37 +01:00
James Cole	4d67d27ba0	Fix #9546	2024-12-18 16:29:19 +01:00
James Cole	edf3876a57	Merge branch 'main' into develop	2024-12-18 16:26:35 +01:00
James Cole	f197e6623b	Merge pull request #9551 from firefly-iii/dependabot/github_actions/github/command-1.3.0	2024-12-16 06:59:19 +01:00
James Cole	42a9809450	Merge pull request #9550 from firefly-iii/dependabot/npm_and_yarn/develop/chartjs-chart-sankey-0.14.0	2024-12-16 06:59:10 +01:00
James Cole	444f80a933	Merge pull request #9549 from firefly-iii/dependabot/npm_and_yarn/develop/ag-grid-community/styles-33.0.2	2024-12-16 06:59:01 +01:00
dependabot[bot]	4b985c818a	Bump github/command from 1.2.2 to 1.3.0 Bumps [github/command](https://github.com/github/command) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/github/command/releases) - [Commits](https://github.com/github/command/compare/v1.2.2...v1.3.0) --- updated-dependencies: - dependency-name: github/command dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:49:31 +00:00
dependabot[bot]	ccd182aed9	Bump chartjs-chart-sankey from 0.13.0 to 0.14.0 Bumps [chartjs-chart-sankey](https://github.com/kurkle/chartjs-chart-sankey) from 0.13.0 to 0.14.0. - [Release notes](https://github.com/kurkle/chartjs-chart-sankey/releases) - [Commits](https://github.com/kurkle/chartjs-chart-sankey/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: chartjs-chart-sankey dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:06:22 +00:00
dependabot[bot]	615eef3fdd	Bump @ag-grid-community/styles from 32.3.3 to 33.0.2 Bumps [@ag-grid-community/styles](https://github.com/ag-grid/ag-grid) from 32.3.3 to 33.0.2. - [Release notes](https://github.com/ag-grid/ag-grid/releases) - [Commits](https://github.com/ag-grid/ag-grid/compare/v32.3.3...v33.0.2) --- updated-dependencies: - dependency-name: "@ag-grid-community/styles" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:06:13 +00:00
James Cole	3117c8846e	Rename branch release.	2024-12-15 12:31:36 +01:00
James Cole	f1c859aaa3	Update build job	2024-12-15 08:57:55 +01:00
James Cole	f0e2913802	Ignore phpcs errors.	2024-12-14 21:50:46 +01:00
James Cole	1fa928b98f	Should work from here	2024-12-14 21:45:20 +01:00
James Cole	1c691cca33	Duh, that wasn't smart.	2024-12-14 21:39:30 +01:00
James Cole	69e1eb3eff	echo debug and upgrade to 8.4	2024-12-14 21:37:45 +01:00
James Cole	90794cb515	Experimental branch build.	2024-12-14 21:35:14 +01:00
James Cole	277f5e538f	Merge pull request #9534 from firefly-iii/dependabot/composer/composer-736964bd2b	2024-12-10 04:33:36 +01:00
dependabot[bot]	89f197b9d4	Bump league/commonmark in the composer group across 1 directory Bumps the composer group with 1 update in the / directory: [league/commonmark](https://github.com/thephpleague/commonmark). Updates `league/commonmark` from 2.5.3 to 2.6.0 - [Release notes](https://github.com/thephpleague/commonmark/releases) - [Changelog](https://github.com/thephpleague/commonmark/blob/2.6/CHANGELOG.md) - [Commits](https://github.com/thephpleague/commonmark/compare/2.5.3...2.6.0) --- updated-dependencies: - dependency-name: league/commonmark dependency-type: direct:production dependency-group: composer ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 01:17:43 +00:00