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

Merge branch 'release/5.6.13'

Browse Source
This commit is contained in:
James Cole
2022-01-30 17:01:28 +01:00
parent 7c553c1f0b 4c3910dc59
commit 4742221b4c
6 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Support/Binder/EitherConfigKey.php
View File

@@ -46,6 +46,7 @@ class EitherConfigKey
'firefly.enable_external_map',
'firefly.expected_source_types',
'firefly.credit_card_types',
'firefly.languages',
'app.timezone',
];

6
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@@ -457,8 +457,12 @@ class SearchRuleEngine implements RuleEngineInterface
private function processTransactionJournal(Rule $rule, array $transaction): void
{
Log::debug(sprintf('SearchRuleEngine:: Will now execute actions on transaction journal #%d', $transaction['transaction_journal_id']));
$actions = $rule->ruleActions()->get();
/** @var RuleAction $ruleAction */
foreach ($rule->ruleActions()->where('active', true)->get() as $ruleAction) {
foreach ($actions as $ruleAction) {
if(false === $ruleAction->active) {
continue;
}
$break = $this->processRuleAction($ruleAction, $transaction);
if (true === $break) {
break;

5
changelog.md
View File

@@ -2,6 +2,11 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## 5.6.13 - 2022-01-29
### Fixed
- Fixed a few broken template references.
## 5.6.12 - 2022-01-29
### Fixed

12
composer.lock generated
View File

@@ -3765,16 +3765,16 @@
},
{
"name": "phpseclib/phpseclib",
"version": "3.0.12",
"version": "3.0.13",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb"
"reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb",
"reference": "89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1443ab79364eea48665fa8c09ac67f37d1025f7e",
"reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e",
"shasum": ""
},
"require": {
@@ -3856,7 +3856,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.12"
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.13"
},
"funding": [
{
@@ -3872,7 +3872,7 @@
"type": "tidelift"
}
],
"time": "2021-11-28T23:46:03+00:00"
"time": "2022-01-30T08:50:05+00:00"
},
{
"name": "pragmarx/google2fa",

4
config/firefly.php
View File

@@ -101,7 +101,7 @@ return [
'webhooks' => true,
'handle_debts' => true,
],
'version' => '5.6.12',
'version' => '5.6.13',
'api_version' => '1.5.5',
'db_version' => 18,
@@ -168,7 +168,7 @@ return [
// 'lt_LT' => ['name_locale' => 'Lietuvių', 'name_english' => 'Lithuanian'],
'nb_NO' => ['name_locale' => 'Norsk', 'name_english' => 'Norwegian'],
'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'],
'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '],
'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish'],
'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'],
'pt_PT' => ['name_locale' => 'Português', 'name_english' => 'Portuguese'],
'ro_RO' => ['name_locale' => 'Română', 'name_english' => 'Romanian'],

2
config/google2fa.php
View File

@@ -76,7 +76,7 @@ return [
/*
* One Time Password View
*/
'view' => sprintf('%s.auth.mfa', env('FIREFLY_III_LAYOUT', 'v1')),
'view' => 'auth.mfa',
/*
* One Time Password error message