diff --git a/THANKS.md b/THANKS.md index 4b590fc92b..f046b17eb6 100755 --- 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 +- Jihad - jreyesr - codearena-bot - Nicky De Maeyer diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php index 2d447d6c73..751f9f580b 100644 --- a/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php +++ b/app/Api/V1/Requests/Autocomplete/AutocompleteApiRequest.php @@ -37,7 +37,7 @@ class AutocompleteApiRequest extends AggregateFormRequest protected function getRequests(): array { return [ - DateRequest::class, + DateRequest::class, [PaginationRequest::class, 'sort_class' => Account::class], AccountTypesApiRequest::class, QueryRequest::class, diff --git a/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php b/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php index e537f3f45f..5662ad207f 100644 --- a/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php +++ b/app/Api/V1/Requests/Models/Account/AccountTypesApiRequest.php @@ -47,7 +47,7 @@ class AccountTypesApiRequest extends ApiRequest if ($validator->failed()) { return; } - $types = explode(',', $this->convertString('types', 'all')); + $types = explode(',', $this->convertString('types', 'all')); $result = []; // split and find all types: foreach ($types as $type) { diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 083224520c..ebab95b7ae 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -672,16 +672,20 @@ class Steam { // Log::debug(sprintf('getSafeUrl(%s, %s)', $unknownUrl, $safeUrl)); $returnUrl = $safeUrl; + try { $unknownHost = parse_url($unknownUrl, PHP_URL_HOST); } catch (UrlException $e) { Log::error(sprintf('Could not parse "%s": %s', $unknownUrl, $e->getMessage())); + return $returnUrl; } + try { $safeHost = parse_url($safeUrl, PHP_URL_HOST); } catch (UrlException $e) { Log::error(sprintf('Could not parse "%s": %s', $unknownUrl, $e->getMessage())); + return $returnUrl; } diff --git a/changelog.md b/changelog.md index bef141e468..a46c12dadf 100644 --- a/changelog.md +++ b/changelog.md @@ -7,12 +7,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added -- #11140 +- [PR 11140](https://github.com/firefly-iii/firefly-iii/pull/11140) (Add Saudi Riyal (SAR) currency) reported by @Jihad ### Fixed -- #11144 -- #11147 +- [Issue 11144](https://github.com/firefly-iii/firefly-iii/issues/11144) (Initial balance is auto suggested as an account) reported by @elliot-gh +- [Issue 11147](https://github.com/firefly-iii/firefly-iii/issues/11147) (Start and End Balance gets blanked out during reconciliation) reported by @lrdshaper ## 6.4.3 - 2025-11-01 diff --git a/config/firefly.php b/config/firefly.php index e6ce1400e3..588e15324b 100644 --- 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' => '6.4.3', - 'build_time' => 1762015997, + 'version' => 'develop/2025-11-01', + 'build_time' => 1762025863, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used.