Merge branch 'develop' into v6.2

# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json

.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"

.github/workflows/release.yml

@@ -269,17 +269,33 @@ jobs:
 
           fi
 
-          # create a development (nightly) release:
+          # create a development release:
-          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
+          if [[ "develop" == "$version" ]]; then
-
             # create the release:
-            echo "Create nightly or branch release."
+            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

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 (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 (config('firefly.feature_flags.running_balance_column')) {
             if (1 === bccomp($transaction->amount, '0')) {
                 Log::debug('Trigger recalculateForJournal');
                 AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
             }
         }
     }
+}

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

composer.json

@@ -88,7 +88,7 @@
         "guzzlehttp/guzzle": "^7.8",
         "jc5/google2fa-laravel": "^2.0",
         "jc5/recovery": "^2",
-        "laravel-json-api/laravel": "^4.0",
+        "laravel-json-api/laravel": "^5.0",
         "laravel-json-api/non-eloquent": "^4.0",
         "laravel-notification-channels/pushover": "^4.0",
         "laravel/framework": "^11",

resources/assets/v1/src/locales/ru.json

@@ -129,7 +129,7 @@
         "logs": "\u041b\u043e\u0433\u0438",
         "response": "\u041e\u0442\u0432\u0435\u0442",
         "visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
-        "reset_webhook_secret": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0441\u0435\u043a\u0440\u0435\u0442 webhook"
+        "reset_webhook_secret": ""
     },
     "form": {
         "url": "\u0421\u0441\u044b\u043b\u043a\u0430",

resources/assets/v2/package.json

@@ -12,14 +12,14 @@
         "laravel-vite-plugin": "^1.0.5",
         "patch-package": "^8.0.0",
         "sass": "^1.78.0",
-        "vite": "^5",
+        "vite": "^6",
         "vite-plugin-manifest-sri": "^0.2.0"
     },
     "dependencies": {
         "@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",