From 30fc0fbf54c963b1d376c761f5b431abbe7696f9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Jan 2022 16:53:57 +0100 Subject: [PATCH 1/4] Various new code. --- app/Support/Binder/EitherConfigKey.php | 1 + app/TransactionRules/Engine/SearchRuleEngine.php | 6 +++++- config/firefly.php | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Support/Binder/EitherConfigKey.php b/app/Support/Binder/EitherConfigKey.php index 7e129348ea..708740125c 100644 --- a/app/Support/Binder/EitherConfigKey.php +++ b/app/Support/Binder/EitherConfigKey.php @@ -46,6 +46,7 @@ class EitherConfigKey 'firefly.enable_external_map', 'firefly.expected_source_types', 'firefly.credit_card_types', + 'firefly.languages', 'app.timezone', ]; diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php index 51bee50b61..113dedddb7 100644 --- a/app/TransactionRules/Engine/SearchRuleEngine.php +++ b/app/TransactionRules/Engine/SearchRuleEngine.php @@ -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; diff --git a/config/firefly.php b/config/firefly.php index aabb7779fe..5f3a13957f 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -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'], From 5cbd93bba65ad8196aba077d1540e0b2d12b4cea Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Jan 2022 16:54:08 +0100 Subject: [PATCH 2/4] Fix #5663 --- config/google2fa.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/google2fa.php b/config/google2fa.php index 98f6da2e85..34e719a2e1 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -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 From ec9e8cd6729e353310d313765c57bfb81295fea0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Jan 2022 16:57:23 +0100 Subject: [PATCH 3/4] Update version. --- config/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/firefly.php b/config/firefly.php index 5f3a13957f..0d1d34e24b 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -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, From 4c3910dc59de9bdbafdf9c90e28fc40532cbfb4a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Jan 2022 17:00:26 +0100 Subject: [PATCH 4/4] Update meta files for new release. --- changelog.md | 5 +++++ composer.lock | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index e2b6a6b537..053d448890 100644 --- a/changelog.md +++ b/changelog.md @@ -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 diff --git a/composer.lock b/composer.lock index 1ce906a62a..91855f2b14 100644 --- a/composer.lock +++ b/composer.lock @@ -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",