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

Auto commit for release 'develop' on 2024-11-04

Browse Source
This commit is contained in:
github-actions
2024-11-04 04:14:51 +01:00
parent ae60cd5b28
commit 6d4004d1ed
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Recurring/ShowController.php
View File

@@ -115,11 +115,11 @@ class ShowController extends Controller
$array['attachments'][] = $item; $array['attachments'][] = $item;
} }
if(null !== $array['nr_of_repetitions']) { if (null !== $array['nr_of_repetitions']) {
$left = $array['nr_of_repetitions'] - $array['journal_count']; $left = $array['nr_of_repetitions'] - $array['journal_count'];
$left = max(0, $left); $left = max(0, $left);
// limit each repetition to X occurrences: // limit each repetition to X occurrences:
foreach($array['repetitions'] as $index => $repetition) { foreach ($array['repetitions'] as $index => $repetition) {
$array['repetitions'][$index]['occurrences'] = array_slice($repetition['occurrences'], 0, $left); $array['repetitions'][$index]['occurrences'] = array_slice($repetition['occurrences'], 0, $left);
} }
} }

26
composer.lock generated
View File

@@ -4367,20 +4367,20 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "3.8.0", "version": "3.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f" "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/10ac0aa86b8062219ce21e8189123d611ca3ecd9",
"reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f", "reference": "10ac0aa86b8062219ce21e8189123d611ca3ecd9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"carbonphp/carbon-doctrine-types": "*", "carbonphp/carbon-doctrine-types": "<100.0",
"ext-json": "*", "ext-json": "*",
"php": "^8.1", "php": "^8.1",
"psr/clock": "^1.0", "psr/clock": "^1.0",
@@ -4469,7 +4469,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-08-19T06:22:39+00:00" "time": "2024-11-03T16:02:24+00:00"
}, },
{ {
"name": "nette/schema", "name": "nette/schema",
@@ -11722,23 +11722,23 @@
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "1.8.2", "version": "1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "153ae662783729388a584b4361f2545e4d841e3c" "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1fb5ba8d045f5dd984ebded5b1cc66f29459422d",
"reference": "153ae662783729388a584b4361f2545e4d841e3c", "reference": "1fb5ba8d045f5dd984ebded5b1cc66f29459422d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/deprecations": "^1.0", "doctrine/deprecations": "^1.0",
"php": "^7.3 || ^8.0", "php": "^7.3 || ^8.0",
"phpdocumentor/reflection-common": "^2.0", "phpdocumentor/reflection-common": "^2.0",
"phpstan/phpdoc-parser": "^1.13" "phpstan/phpdoc-parser": "^1.18"
}, },
"require-dev": { "require-dev": {
"ext-tokenizer": "*", "ext-tokenizer": "*",
@@ -11774,9 +11774,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": { "support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues", "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.9.0"
}, },
"time": "2024-02-23T11:10:43+00:00" "time": "2024-11-03T20:11:34+00:00"
}, },
{ {
"name": "phpmyadmin/sql-parser", "name": "phpmyadmin/sql-parser",

2
config/firefly.php
View File

@@ -110,7 +110,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => 'develop/2024-11-03', 'version' => 'develop/2024-11-04',
'api_version' => '2.1.0', 'api_version' => '2.1.0',
'db_version' => 24, 'db_version' => 24,