Merge branch 'release/5.2.1'

5.2.0

app/Http/Controllers/Chart/TransactionController.php

@@ -138,6 +138,7 @@ class TransactionController extends Controller
                 $collector->setTypes([TransactionType::DEPOSIT]);
                 break;
             case 'transfers':
+            case 'transfer':
                 $collector->setTypes([TransactionType::TRANSFER]);
                 break;
         }

app/Http/Requests/BudgetFormStoreRequest.php

@@ -68,7 +68,7 @@ class BudgetFormStoreRequest extends Request
             'name'                    => 'required|between:1,100|uniqueObjectForUser:budgets,name',
             'active'                  => 'numeric|between:0,1',
             'auto_budget_type'        => 'numeric|between:0,2',
-            'auto_budget_currency_id' => 'required|exists:transaction_currencies,id',
+            'auto_budget_currency_id' => 'exists:transaction_currencies,id',
             'auto_budget_amount'      => 'min:0|max:1000000000',
             'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
         ];

app/Http/Requests/BudgetFormUpdateRequest.php

@@ -78,7 +78,7 @@ class BudgetFormUpdateRequest extends Request
             'name'                    => $nameRule,
             'active'                  => 'numeric|between:0,1',
             'auto_budget_option'      => 'numeric|between:0,2',
-            'auto_budget_currency_id' => 'required|exists:transaction_currencies,id',
+            'auto_budget_currency_id' => 'exists:transaction_currencies,id',
             'auto_budget_amount'      => 'min:0|max:1000000000',
             'auto_budget_period'      => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
         ];

changelog.md

@@ -2,8 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.2.1 (API 1.1.0)] - 2020-04-10
 
-## [5.2.0 (API 1.1.0)] - 2020-04-11
+Firefly III 5.2.1 fixes an issue with charts and allows users to store budgets again.
+
+## [5.2.0 (API 1.1.0)] - 2020-04-10
 
 - ⚠️ This will be the last version to support PHP version 7.3. The next release will require PHP **7.4**
 - ⚠️ The bunq and CSV import routines have been disabled and replaced by their stand alone variants: [bunq](https://github.com/firefly-iii/bunq-importer), [CSV](https://github.com/firefly-iii/csv-importer).

composer.lock

@@ -6978,16 +6978,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.3.0",
+            "version": "v4.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
+                "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
-                "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
+                "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120",
                 "shasum": ""
             },
             "require": {
@@ -7026,7 +7026,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-11-08T13:50:10+00:00"
+            "time": "2020-04-10T16:34:50+00:00"
         },
         {
             "name": "ocramius/package-versions",

config/firefly.php

@@ -138,7 +138,7 @@ return [
     ],
 
     'encryption'                   => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
-    'version'                      => '5.2.0',
+    'version'                      => '5.2.1',
     'api_version'                  => '1.1.0',
     'db_version'                   => 13,
     'maxUploadSize'                => 15242880,