mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2024-11-25 02:10:22 -06:00
Auto commit for release 'develop' on 2024-09-30
This commit is contained in:
parent
f475393bc1
commit
cbd50634a4
@ -100,6 +100,7 @@ class PopupReport implements PopupReportInterface
|
|||||||
$repos = app(CurrencyRepositoryInterface::class);
|
$repos = app(CurrencyRepositoryInterface::class);
|
||||||
$currency = $repos->find((int)$currencyId);
|
$currency = $repos->find((int)$currencyId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @var GroupCollectorInterface $collector */
|
/** @var GroupCollectorInterface $collector */
|
||||||
$collector = app(GroupCollectorInterface::class);
|
$collector = app(GroupCollectorInterface::class);
|
||||||
$collector
|
$collector
|
||||||
@ -119,6 +120,7 @@ class PopupReport implements PopupReportInterface
|
|||||||
if (null !== $budget->id && 0 !== $budget->id) {
|
if (null !== $budget->id && 0 !== $budget->id) {
|
||||||
$collector->setBudget($budget);
|
$collector->setBudget($budget);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $collector->getExtractedJournals();
|
return $collector->getExtractedJournals();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
36
composer.lock
generated
36
composer.lock
generated
@ -3473,16 +3473,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem",
|
"name": "league/flysystem",
|
||||||
"version": "3.28.0",
|
"version": "3.29.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem.git",
|
"url": "https://github.com/thephpleague/flysystem.git",
|
||||||
"reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c"
|
"reference": "0adc0d9a51852e170e0028a60bd271726626d3f0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
|
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0",
|
||||||
"reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c",
|
"reference": "0adc0d9a51852e170e0028a60bd271726626d3f0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3550,22 +3550,22 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/thephpleague/flysystem/issues",
|
"issues": "https://github.com/thephpleague/flysystem/issues",
|
||||||
"source": "https://github.com/thephpleague/flysystem/tree/3.28.0"
|
"source": "https://github.com/thephpleague/flysystem/tree/3.29.0"
|
||||||
},
|
},
|
||||||
"time": "2024-05-22T10:09:12+00:00"
|
"time": "2024-09-29T11:59:11+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/flysystem-local",
|
"name": "league/flysystem-local",
|
||||||
"version": "3.28.0",
|
"version": "3.29.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/thephpleague/flysystem-local.git",
|
"url": "https://github.com/thephpleague/flysystem-local.git",
|
||||||
"reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40"
|
"reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
|
"url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
|
||||||
"reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40",
|
"reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -3599,9 +3599,9 @@
|
|||||||
"local"
|
"local"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0"
|
"source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
|
||||||
},
|
},
|
||||||
"time": "2024-05-06T20:05:52+00:00"
|
"time": "2024-08-09T21:24:39+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "league/fractal",
|
"name": "league/fractal",
|
||||||
@ -10765,16 +10765,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/php-parser",
|
"name": "nikic/php-parser",
|
||||||
"version": "v5.2.0",
|
"version": "v5.3.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||||
"reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb"
|
"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
|
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
|
||||||
"reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
|
"reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -10817,9 +10817,9 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/nikic/PHP-Parser/issues",
|
"issues": "https://github.com/nikic/PHP-Parser/issues",
|
||||||
"source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0"
|
"source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
|
||||||
},
|
},
|
||||||
"time": "2024-09-15T16:40:33+00:00"
|
"time": "2024-09-29T13:56:26+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phar-io/manifest",
|
"name": "phar-io/manifest",
|
||||||
|
@ -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' => '6.1.21',
|
'version' => 'develop/2024-09-30',
|
||||||
'api_version' => '2.1.0',
|
'api_version' => '2.1.0',
|
||||||
'db_version' => 24,
|
'db_version' => 24,
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user