kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 16:00:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/v6.0.29'

Browse Source
This commit is contained in:
James Cole
2023-10-28 17:31:59 +02:00
parent 461b5ad859 85b1768908
commit a3490e97c0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Transformers/BillTransformer.php
View File

@@ -86,7 +86,7 @@ class BillTransformer extends AbstractTransformer
foreach ($payDates as $string) { foreach ($payDates as $string) {
$payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString(); $payDatesFormatted[] = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'))->toAtomString();
} }
$nextExpectedMatch = null; $nextExpectedMatch = '';
if (null !== ($payDates[0] ?? null)) { if (null !== ($payDates[0] ?? null)) {
$nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $payDates[0], config('app.timezone'))->toAtomString(); $nextExpectedMatch = Carbon::createFromFormat('!Y-m-d', $payDates[0], config('app.timezone'))->toAtomString();
} }

6
changelog.md
View File

@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## 6.0.29 - 2023-10-29
### Fixed
- Null pointer in bill overview
## 6.0.28 - 2023-10-29 ## 6.0.28 - 2023-10-29
### Added ### Added

2
config/firefly.php
View File

@@ -112,7 +112,7 @@ return [
'handle_debts' => true, 'handle_debts' => true,
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.0.28', 'version' => '6.0.29',
'api_version' => '2.0.11', 'api_version' => '2.0.11',
'db_version' => 21, 'db_version' => 21,