Merge branch 'release/5.7.7'

2025-02-20 11:48:27 -06:00 · 2022-05-31 06:05:39 +02:00 · 2022-05-31 06:05:39 +02:00 · b1ea36ae5b
commit b1ea36ae5b
parent 993d18d508 2f75437ac1
20 changed files with 636 additions and 604 deletions
--- a/.github/workflows/depsreview.yaml
+++ b/.github/workflows/depsreview.yaml
@ -0,0 +1,14 @@
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v1
--- a/app/Handlers/Events/UserEventHandler.php
+++ b/app/Handlers/Events/UserEventHandler.php
@ -338,6 +338,12 @@ class UserEventHandler
        Log::debug('Now in storeUserIPAddress');
        $user = $event->user;
        /** @var array $preference */
+
+        if($user->hasRole('demo')) {
+            Log::debug('Do not log demo user logins');
+            return;
+        }
+
        try {
            $preference = app('preferences')->getForUser($user, 'login_ip_history', [])->data;
        } catch (FireflyException $e) {
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@ -99,7 +99,9 @@ class Steam
        $sum = '0';
        /** @var array $transaction */
        foreach ($transactions as $transaction) {
-            $sum = bcadd($sum, $transaction[$key] ?? '0');
+            $value = (string) ($transaction[$key] ?? '0');
+            $value = '' === $value ? '0' : $value;
+            $sum   = bcadd($sum, $value);
        }

        return $sum;
--- a/changelog.md
+++ b/changelog.md
@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 5.7.7 - 2022-06-01
+
+### Fixed
+- Fixed an issue where the login form would overflow a database field.
+- [Issue 6113](https://github.com/firefly-iii/firefly-iii/issues/6113) Fix issue with number formatting.
+- [Issue 5996](https://github.com/firefly-iii/firefly-iii/issues/5996) Catch bad library
+
+### Added
+- @turrisxyz added a dependency review, thanks!
+
 ## 5.7.6 - 2022-05-19

 ### Fixed
--- a/composer.lock
+++ b/composer.lock
--- a/config/firefly.php
+++ b/config/firefly.php
@ -101,7 +101,7 @@ return [
        'webhooks'     => false,
        'handle_debts' => true,
    ],
-    'version'                      => '5.7.6',
+    'version'                      => '5.7.7',
    'api_version'                  => '1.5.6',
    'db_version'                   => 18,

@ -283,6 +283,12 @@ return [
        'application/vnd.oasis.opendocument.formula',
        'application/vnd.oasis.opendocument.database',
        'application/vnd.oasis.opendocument.image',
+
+        /* EML */
+        'message/rfc822',
+
+        /* JSON */
+        'application/json',
    ],
    'accountRoles'                 => ['defaultAsset', 'sharedAsset', 'savingAsset', 'ccAsset', 'cashWalletAsset'],
    'valid_liabilities'            => [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE],
--- a/config/mail.php
+++ b/config/mail.php
@ -44,6 +44,7 @@ return [
            'username'   => env('MAIL_USERNAME'),
            'password'   => env('MAIL_PASSWORD'),
            'timeout'    => null,
+            'verify_peer' => null !== env('MAIL_ENCRYPTION')
        ],

        'ses' => [
--- a/frontend/src/i18n/el_GR/index.js
+++ b/frontend/src/i18n/el_GR/index.js
@ -7,7 +7,7 @@ export default {
        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
        "amount_min": "\u0395\u03bb\u03ac\u03c7\u03b9\u03c3\u03c4\u03bf \u03c0\u03bf\u03c3\u03cc",
        "amount_max": "\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf \u03c0\u03bf\u03c3\u03cc",
-        "url": "URL",
+        "url": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL",
        "title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
        "first_date": "\u03a0\u03c1\u03ce\u03c4\u03b7 \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1",
        "repetitions": "\u0395\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03b9\u03c2",
@ -18,26 +18,26 @@ export default {
    },
    "list": {
        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-        "account_number": "Account number",
+        "account_number": "\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03bb\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03cd",
        "currentBalance": "\u03a4\u03c1\u03ad\u03c7\u03bf\u03bd \u03c5\u03c0\u03cc\u03bb\u03bf\u03b9\u03c0\u03bf",
        "lastActivity": "\u03a4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03b1 \u03b4\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1",
        "active": "\u0395\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03cc;"
    },
    "breadcrumbs": {
        "placeholder": "[Placeholder]",
-        "budgets": "Budgets",
-        "subscriptions": "Subscriptions",
-        "transactions": "Transactions",
-        "title_expenses": "Expenses",
-        "title_withdrawal": "Expenses",
-        "title_revenue": "Revenue \/ income",
-        "title_deposit": "Revenue \/ income",
-        "title_transfer": "Transfers",
-        "title_transfers": "Transfers",
-        "asset_accounts": "Asset accounts",
-        "expense_accounts": "Expense accounts",
-        "revenue_accounts": "Revenue accounts",
-        "liabilities_accounts": "Liabilities"
+        "budgets": "\u03a0\u03c1\u03bf\u03cb\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03bf\u03af",
+        "subscriptions": "\u03a3\u03c5\u03bd\u03b4\u03c1\u03bf\u03bc\u03ad\u03c2",
+        "transactions": "\u03a3\u03c5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2",
+        "title_expenses": "\u0394\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2",
+        "title_withdrawal": "\u0394\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2",
+        "title_revenue": "\u0388\u03c3\u03bf\u03b4\u03b1",
+        "title_deposit": "\u0388\u03c3\u03bf\u03b4\u03b1",
+        "title_transfer": "\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ad\u03c2",
+        "title_transfers": "\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ad\u03c2",
+        "asset_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af \u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03bf\u03c5",
+        "expense_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af \u03b4\u03b1\u03c0\u03b1\u03bd\u03ce\u03bd",
+        "revenue_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af \u03b5\u03c3\u03cc\u03b4\u03c9\u03bd",
+        "liabilities_accounts": "\u03a5\u03c0\u03bf\u03c7\u03c1\u03b5\u03ce\u03c3\u03b5\u03b9\u03c2"
    },
    "firefly": {
        "actions": "\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b5\u03c2",
@ -150,7 +150,7 @@ export default {
        "asset_accounts": "\u039a\u03b5\u03c6\u03ac\u03bb\u03b1\u03b9\u03b1",
        "expense_accounts": "\u0394\u03b1\u03c0\u03ac\u03bd\u03b5\u03c2",
        "liabilities_accounts": "\u03a5\u03c0\u03bf\u03c7\u03c1\u03b5\u03ce\u03c3\u03b5\u03b9\u03c2",
-        "undefined_accounts": "Accounts",
+        "undefined_accounts": "\u039b\u03bf\u03b3\u03b1\u03c1\u03b9\u03b1\u03c3\u03bc\u03bf\u03af",
        "name": "\u038c\u03bd\u03bf\u03bc\u03b1",
        "revenue_accounts": "\u0388\u03c3\u03bf\u03b4\u03b1",
        "description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
--- a/frontend/src/i18n/zh_CN/index.js
+++ b/frontend/src/i18n/zh_CN/index.js
@ -50,7 +50,7 @@ export default {
        "rule_trigger_source_account_ends_choice": "\u6765\u6e90\u8d26\u6237\u7ed3\u5c3e\u4e3a\u2026",
        "rule_trigger_source_account_is_choice": "\u6765\u6e90\u8d26\u6237\u540d\u79f0\u4e3a...",
        "rule_trigger_source_account_contains_choice": "\u6765\u6e90\u8d26\u6237\u540d\u79f0\u5305\u542b...",
-        "rule_trigger_account_id_choice": "\u4efb\u4f55\u4e00\u4e2a\u8d26\u6237ID\u4e3a",
+        "rule_trigger_account_id_choice": "\u5176\u4e2d\u4e00\u4e2a\u8d26\u6237ID\u4e3a...",
        "rule_trigger_source_account_id_choice": "\u6765\u6e90\u8d26\u6237 ID \u4e3a...",
        "rule_trigger_destination_account_id_choice": "\u76ee\u6807\u8d26\u6237 ID \u4e3a...",
        "rule_trigger_account_is_cash_choice": "\u5176\u4e2d\u4e00\u4e2a\u8d26\u6237\u662f\u73b0\u91d1\u8d26\u6237",
--- a/package.json
+++ b/package.json
@ -10,7 +10,7 @@
    },
    "devDependencies": {
        "@johmun/vue-tags-input": "^2",
-        "@vue/compiler-sfc": "^3.2.33",
+        "@vue/compiler-sfc": "^3.2.36",
        "axios": "^0.27",
        "bootstrap-sass": "^3",
        "cross-env": "^7.0",
--- a/resources/lang/el_GR/breadcrumbs.php
+++ b/resources/lang/el_GR/breadcrumbs.php
@ -24,15 +24,15 @@ declare(strict_types=1);

 return [
    'home'                   => 'Αρχική',
-    'budgets'                => 'Budgets',
-    'subscriptions'          => 'Subscriptions',
-    'transactions'           => 'Transactions',
-    'title_expenses'         => 'Expenses',
-    'title_withdrawal'       => 'Expenses',
-    'title_revenue'          => 'Revenue / income',
-    'title_deposit'          => 'Revenue / income',
-    'title_transfer'         => 'Transfers',
-    'title_transfers'        => 'Transfers',
+    'budgets'                => 'Προϋπολογισμοί',
+    'subscriptions'          => 'Συνδρομές',
+    'transactions'           => 'Συναλλαγές',
+    'title_expenses'         => 'Δαπάνες',
+    'title_withdrawal'       => 'Δαπάνες',
+    'title_revenue'          => 'Έσοδα',
+    'title_deposit'          => 'Έσοδα',
+    'title_transfer'         => 'Μεταφορές',
+    'title_transfers'        => 'Μεταφορές',
    'edit_currency'          => 'Επεξεργασία νομίσματος ":name"',
    'delete_currency'        => 'Διαγραφή νομίσματος ":name"',
    'newPiggyBank'           => 'Δημιουργία ενός νέου κουμπαρά',
@ -70,9 +70,9 @@ return [
    'edit_object_group'      => 'Επεξεργασία ομάδας ":title"',
    'delete_object_group'    => 'Διαγραφή ομάδας ":title"',
    'logout_others'          => 'Αποσυνδέσετε τις άλλες συνεδρίες',
-    'asset_accounts'         => 'Asset accounts',
-    'expense_accounts'       => 'Expense accounts',
-    'revenue_accounts'       => 'Revenue accounts',
-    'liabilities_accounts'   => 'Liabilities',
+    'asset_accounts'         => 'Λογαριασμοί κεφαλαίου',
+    'expense_accounts'       => 'Λογαριασμοί δαπανών',
+    'revenue_accounts'       => 'Λογαριασμοί εσόδων',
+    'liabilities_accounts'   => 'Υποχρεώσεις',
    'placeholder'            => '[Placeholder]',
 ];
--- a/resources/lang/el_GR/config.php
+++ b/resources/lang/el_GR/config.php
@ -34,10 +34,10 @@ return [
    'month_and_day_js'         => 'Do MMMM YYYY',

    //'month_and_date_day'      => '%A %B %e, %Y',
-    'month_and_date_day_js'    => 'dddd MMMM Do, YYYY',
+    'month_and_date_day_js'    => 'dddd Do MMMM YYYY',

    //'month_and_day_no_year'   => '%B %e',
-    'month_and_day_no_year_js' => 'MMMM Do',
+    'month_and_day_no_year_js' => 'Do MMMM',

    //'date_time'               => '%B %e, %Y, @ %T',
    'date_time_js'             => 'Do MMMM YYYY, HH:mm:ss',
--- a/resources/lang/el_GR/firefly.php
+++ b/resources/lang/el_GR/firefly.php
@ -1394,7 +1394,7 @@ return [
    'make_new_revenue_account'                  => 'Δημιουργία νέου λογαριασμού εσόδων',
    'make_new_liabilities_account'              => 'Δημιουργία νέας υποχρέωσης',
    'asset_accounts'                            => 'Κεφάλαια',
-    'undefined_accounts'                        => 'Accounts',
+    'undefined_accounts'                        => 'Λογαριασμοί',
    'asset_accounts_inactive'                   => 'Λογαριασμοί κεφαλαίου (ανενεργοί)',
    'expense_accounts'                          => 'Δαπάνες',
    'expense_accounts_inactive'                 => 'Λογαριασμοί δαπανών (ανενεργοί)',
--- a/resources/lang/el_GR/form.php
+++ b/resources/lang/el_GR/form.php
@ -180,8 +180,8 @@ return [
    'blocked_code'                => 'Αιτία αποκλεισμού',
    'login_name'                  => 'Είσοδος',
    'is_owner'                    => 'Είναι διαχειριστής;',
-    'url'                         => 'URL',
-    'bill_end_date'               => 'End date',
+    'url'                         => 'Διεύθυνση URL',
+    'bill_end_date'               => 'Ημερομηνία λήξης',

    // import
    'apply_rules'                 => 'Εφαρμογή κανόνων',
--- a/resources/lang/el_GR/list.php
+++ b/resources/lang/el_GR/list.php
@ -76,7 +76,7 @@ return [
    'type'                    => 'Τύπος',
    'completed'               => 'Ολοκληρώθηκε',
    'iban'                    => 'IBAN',
-    'account_number'              => 'Account number',
+    'account_number'              => 'Αριθμός λογαριασμού',
    'paid_current_period'     => 'Πληρώθηκαν αυτή την περίοδο',
    'email'                   => 'Email',
    'registered_at'           => 'Εγγράφηκε στις',
--- a/resources/lang/el_GR/validation.php
+++ b/resources/lang/el_GR/validation.php
@ -61,9 +61,9 @@ return [
    'accepted'                       => 'Το :attribute πρέπει να γίνει αποδεκτό.',
    'bic'                            => 'Αυτό δεν είναι έγκυρο IBAN.',
    'at_least_one_trigger'           => 'Ο κανόνας πρέπει να έχει τουλάχιστον ένα κριτήριο ενεργοποίησης.',
-    'at_least_one_active_trigger'    => 'Rule must have at least one active trigger.',
+    'at_least_one_active_trigger'    => 'Ο κανόνας πρέπει να έχει τουλάχιστον ένα ενεργό κριτήριο ενεργοποίησης.',
    'at_least_one_action'            => 'Ο κανόνας πρέπει να έχει τουλάχιστον μία λειτουργία.',
-    'at_least_one_active_action'     => 'Rule must have at least one active action.',
+    'at_least_one_active_action'     => 'Ο κανόνας πρέπει να έχει τουλάχιστον μία ενεργή λειτουργία.',
    'base64'                         => 'Αυτά δεν είναι έγκυρα base64 κωδικοποιημένα δεδομένα.',
    'model_id_invalid'               => 'Το παραχωρημένο αναγνωριστικό δε φαίνεται έγκυρο για αυτό το μοντέλο.',
    'less'                           => 'Το :attribute πρέπει να είναι μικρότερο από 10,000,000',
--- a/resources/lang/es_ES/email.php
+++ b/resources/lang/es_ES/email.php
@ -44,12 +44,12 @@ return [
    // access token created
    'access_token_created_subject'            => 'Se ha creado un nuevo token de acceso',
    'access_token_created_body'               => 'Alguien (esperemos que usted) acaba de crear un nuevo token de acceso a la API de Firefly III para tu cuenta de usuario.',
-    'access_token_created_explanation'        => 'With this token, they can access **all** of your financial records through the Firefly III API.',
-    'access_token_created_revoke'             => 'If this wasn\'t you, please revoke this token as soon as possible at :url',
+    'access_token_created_explanation'        => 'Con este token, pueden acceder a **todos** sus registros financieros a través de la API de Firefly III.',
+    'access_token_created_revoke'             => 'Si no era usted, por favor, revoque este token tan pronto como sea posible, en :url',

    // registered
    'registered_subject'                      => 'Bienvenido a Firefly III!',
-    'registered_welcome'                      => 'Welcome to [Firefly III](:address). Your registration has made it, and this email is here to confirm it. Yay!',
+    'registered_welcome'                      => 'Bienvenido/a a [Firefly III](:address). Su registro se ha realizado correctamente, y este correo electrónico está aquí para confirmarlo. ¡Yeah!',
    'registered_pw'                           => 'If you have forgotten your password already, please reset it using [the password reset tool](:address/password/reset).',
    'registered_help'                         => 'Hay un icono de ayuda en la esquina superior derecha de cada página. Si necesita ayuda, ¡Haga clic en él!',
    'registered_doc_html'                     => 'If you haven\'t already, please read the [grand theory](https://docs.firefly-iii.org/about-firefly-iii/personal-finances).',
--- a/resources/lang/zh_CN/firefly.php
+++ b/resources/lang/zh_CN/firefly.php
@ -491,7 +491,7 @@ return [
    'search_modifier_updated_at_on'                       => 'Transaction was updated on ":value"',
    'search_modifier_updated_at_before'                   => 'Transaction was updated on or before ":value"',
    'search_modifier_updated_at_after'                    => 'Transaction was updated on or after ":value"',
-    'search_modifier_attachment_name_is'                  => '任何一个附件名称为":value"',
+    'search_modifier_attachment_name_is'                  => '任意一个附件名称为":value"',
    'search_modifier_attachment_name_contains'            => '任何附件的名称包含":value"',
    'search_modifier_attachment_name_starts'              => '任何附件的名称开头为":value"',
    'search_modifier_attachment_name_ends'                => '任何附件的名称结尾为":value"',
@ -605,7 +605,7 @@ return [
    'rule_trigger_source_account_is'                      => '来源账户名称为“:trigger_value”',
    'rule_trigger_source_account_contains_choice'         => '来源账户名称包含...',
    'rule_trigger_source_account_contains'                => '来源账户名称包含“:trigger_value”',
-    'rule_trigger_account_id_choice'                      => '任何一个账户ID为',
+    'rule_trigger_account_id_choice'                      => '其中一个账户ID为...',
    'rule_trigger_account_id'                             => '其中一个账户ID是:trigger_value',
    'rule_trigger_source_account_id_choice'               => '来源账户 ID 为...',
    'rule_trigger_source_account_id'                      => '来源账户 ID 为 :trigger_value',
@ -726,18 +726,18 @@ return [
    'rule_trigger_user_action_choice'                     => 'User action is ":trigger_value"',
    'rule_trigger_tag_is_not_choice'                      => '标签不为":trigger_value"',
    'rule_trigger_tag_is_not'                             => '标签不为...',
-    'rule_trigger_account_is_choice'                      => '任何一个账户为',
-    'rule_trigger_account_is'                             => '任何一个账户为":trigger_value"',
-    'rule_trigger_account_contains_choice'                => '任何一个账户包含',
-    'rule_trigger_account_contains'                       => '任何一个账户包含":trigger_value"',
+    'rule_trigger_account_is_choice'                      => '其中一个账户为...',
+    'rule_trigger_account_is'                             => '其中一个账户为":trigger_value"',
+    'rule_trigger_account_contains_choice'                => '其中一个账户包含...',
+    'rule_trigger_account_contains'                       => '其中一个账户包含":trigger_value"',
    'rule_trigger_account_ends_choice'                    => '其中一个账户结尾为...',
    'rule_trigger_account_ends'                           => '其中一个账户结尾为":trigger_value"',
    'rule_trigger_account_starts_choice'                  => '其中一个账户开头为...',
    'rule_trigger_account_starts'                         => '其中一个账户开头为":trigger_value"',
-    'rule_trigger_account_nr_is_choice'                   => '任何一个账户编号/IBAN为',
-    'rule_trigger_account_nr_is'                          => '任何一个账户编号/IBAN为":trigger_value"',
-    'rule_trigger_account_nr_contains_choice'             => '任何一个账户编号/IBAN包含',
-    'rule_trigger_account_nr_contains'                    => '任何一个账户编号/IBAN包含":trigger_value"',
+    'rule_trigger_account_nr_is_choice'                   => '其中一个账户编号/IBAN为...',
+    'rule_trigger_account_nr_is'                          => '其中一个账户编号/IBAN为":trigger_value"',
+    'rule_trigger_account_nr_contains_choice'             => '其中一个账户编号/IBAN包含...',
+    'rule_trigger_account_nr_contains'                    => '其中一个账户编号/IBAN包含":trigger_value"',
    'rule_trigger_account_nr_ends_choice'                 => '其中一个账户编号/IBAN结尾为...',
    'rule_trigger_account_nr_ends'                        => '其中一个账户编号/IBAN结尾为":trigger_value"',
    'rule_trigger_account_nr_starts_choice'               => '其中一个账户编号/IBAN开头为...',
--- a/sonar-project.properties
+++ b/sonar-project.properties
@ -12,6 +12,6 @@ sonar.organization=firefly-iii
 #sonar.sourceEncoding=UTF-8


-sonar.projectVersion=5.7.6
+sonar.projectVersion=5.7.7
 sonar.sources=app,bootstrap,database,resources/assets,resources/views,routes,tests
 sonar.sourceEncoding=UTF-8
--- a/yarn.lock
+++ b/yarn.lock