From 0ab9db23d1aa3e46510c78df44c61b7918f94fa6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 17 Sep 2021 09:23:49 +0200 Subject: [PATCH] Update meta files for new release. --- app/Models/GroupMembership.php | 19 ----------------- changelog.md | 37 ++++++++++++++++++++++++--------- config/firefly.php | 2 +- config/user_roles.php | 19 ----------------- releases.md | 6 +++--- resources/lang/bg_BG/errors.php | 3 +++ resources/lang/cs_CZ/errors.php | 3 +++ resources/lang/de_DE/errors.php | 3 +++ resources/lang/el_GR/errors.php | 3 +++ resources/lang/en_GB/errors.php | 4 ++++ resources/lang/es_ES/errors.php | 3 +++ resources/lang/fi_FI/errors.php | 3 +++ resources/lang/fr_FR/errors.php | 3 +++ resources/lang/hu_HU/errors.php | 3 +++ resources/lang/id_ID/errors.php | 3 +++ resources/lang/it_IT/errors.php | 4 ++++ resources/lang/ja_JP/errors.php | 3 +++ resources/lang/nb_NO/errors.php | 3 +++ resources/lang/nl_NL/errors.php | 3 +++ resources/lang/pl_PL/errors.php | 3 +++ resources/lang/pt_BR/errors.php | 3 +++ resources/lang/pt_PT/errors.php | 3 +++ resources/lang/ro_RO/errors.php | 3 +++ resources/lang/ru_RU/errors.php | 3 +++ resources/lang/sk_SK/errors.php | 3 +++ resources/lang/sv_SE/errors.php | 3 +++ resources/lang/tr_TR/errors.php | 3 +++ resources/lang/vi_VN/errors.php | 3 +++ resources/lang/zh_CN/errors.php | 3 +++ resources/lang/zh_TW/errors.php | 3 +++ sonar-project.properties | 2 +- yarn.lock | 30 +++++++++++++------------- 32 files changed, 124 insertions(+), 68 deletions(-) diff --git a/app/Models/GroupMembership.php b/app/Models/GroupMembership.php index 569ac9a710..6dcf50c4b7 100644 --- a/app/Models/GroupMembership.php +++ b/app/Models/GroupMembership.php @@ -21,25 +21,6 @@ */ declare(strict_types=1); -/* - * GroupMembership.php - * Copyright (c) 2021 james@firefly-iii.org - * - * This file is part of Firefly III (https://github.com/firefly-iii). - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ namespace FireflyIII\Models; diff --git a/changelog.md b/changelog.md index c4a6eb5751..595b508d92 100644 --- a/changelog.md +++ b/changelog.md @@ -2,38 +2,55 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## 5.6.0 - 2021-xx-xx +## 5.6.0 - 2021-09-17 -⚠️ This release features new LDAP libraries. Your mileage may vary. Make sure you back up everything. Firefly III may accidentally create a new account for you instead of reusing the old one. There is no option for LDAP filters yet. +⚠️ This release features new LDAP libraries. Your mileage may vary. Make sure you back up everything. Firefly III may accidentally create a new account for you instead of reusing the old one. There is no option for LDAP filters yet. + +Please refer to the [documentation](https://docs.firefly-iii.org/firefly-iii/) and support channels if you run into problems: + +- [Gitter.im](https://gitter.im/firefly-iii/firefly-iii) +- [Twitter](https://twitter.com/Firefly_III/) +- [GitHub Issues](https://github.com/firefly-iii/firefly-iii/issues) +- [GitHub Discussions](https://github.com/firefly-iii/firefly-iii/discussions) ### Added - A few new pages for the new v2 layout. Thanks @alex6480! -- Added a new currency yay! -- You can now manage loans and debts a little better. +- Added a new currency, thanks @kasperkls02! +- You can now manage loans and debts a little better, see also the documentation for help. +- Some screenshots are now in the GitHub repository for better management, thanks @Flightkick! +- @LBreda has added a service worker and updated icons, thanks! ### Changed +- @hoshsadiq has added all PHP requirements to the composer file, thanks! - A better cache routine for layout v2 pages. -- All LDAP libraries have been upgrade. - -### Deprecated -- Initial release. +- All LDAP libraries have been upgraded. +- New issue templates and help text for easier GitHub support. +- First preparations for multi-administration and group membership options. +- The search will return nothing if you submit invalid values, instead of everything. ### Removed - All telemetry options have been removed. - ### Fixed - [Issue 4894](https://github.com/firefly-iii/firefly-iii/issues/4894) Bad number comparison +- [Issue 4987](https://github.com/firefly-iii/firefly-iii/issues/4987) Budgeted amount includes inactive budgets +- [Issue 4988](https://github.com/firefly-iii/firefly-iii/issues/4988) Can't select liability account from imported transactions +- #5042 HTTP 500 when creating Personal Access Token or OAuth Client - Various Sonarqube issues, thanks @hazma-fadil! - Correct menu display, thanks @vonsogt! - +- The IBAN validator will filter special characters. +- In some cases, piggy banks would report being full or empty while this was not actually the case. +- Various other bugs and minor issues. ### Security - Feature to be able to rebuild Docker images and show security warnings in new builds. +- [CVE-2021-3663](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3663) A missing rate limiter makes brute-forcing the login easy. +- It also fixes [CVE-2021-3728](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3728), [CVE-2021-3729](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3729) and [CVE-2021-3730](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3730), all variations of the same security vulnerability: some actions in Firefly III were vulnerable to CSRF. ### API - You can disable webhooks with an extra field in API submissions. - There is a static cron token (see `.env.example`) which is useful for Docker. +- A better endpoint to move transactions around, see [api-docs.firefly-iii.org](https://api-docs.firefly-iii.org). ## 5.5.13 - 2021-07-25 diff --git a/config/firefly.php b/config/firefly.php index 477f2164fd..347f1c25b1 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -101,7 +101,7 @@ return [ 'webhooks' => true, 'handle_debts' => true, ], - 'version' => '5.6.0-alpha.2', + 'version' => '5.6.0', 'api_version' => '1.5.3', 'db_version' => 18, diff --git a/config/user_roles.php b/config/user_roles.php index 899377a119..3eb1092dd8 100644 --- a/config/user_roles.php +++ b/config/user_roles.php @@ -21,25 +21,6 @@ */ declare(strict_types=1); -/* - * user_roles.php - * Copyright (c) 2021 james@firefly-iii.org - * - * This file is part of Firefly III (https://github.com/firefly-iii). - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ use FireflyIII\Models\UserRole; diff --git a/releases.md b/releases.md index 5d53be15ff..9b981aa948 100644 --- a/releases.md +++ b/releases.md @@ -16,11 +16,11 @@ The different alpha and beta builds will be compiled from their corresponding ta ### Minor Release Support Matrix | Version | Supported | | ------- | ------------------ | -| Firefly III v5.5.x | :white_check_mark: | +| Firefly III v5.6.x | :white_check_mark: | +| Firefly III v5.5.x | :x: | | Firefly III v5.4.x | :x: | | Firefly III v5.3.x | :x: | -| Firefly III v5.2.x | :x: | -| Firefly III v5.1.x (and earlier) | :x: | +| Firefly III v5.2.x (and earlier) | :x: | ### Upgrade path and support policy The upgrade path for Firefly III is: diff --git a/resources/lang/bg_BG/errors.php b/resources/lang/bg_BG/errors.php index 88d7dcd422..e40adf2a9a 100644 --- a/resources/lang/bg_BG/errors.php +++ b/resources/lang/bg_BG/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Разкажете ни повече от „казва Опаааа!“', 'include_logs' => 'Включете регистрационни файлове за грешки (вижте по-горе).', 'what_did_you_do' => 'Кажете ни какво правихте.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/cs_CZ/errors.php b/resources/lang/cs_CZ/errors.php index 311b8d98c7..30a0143bc6 100644 --- a/resources/lang/cs_CZ/errors.php +++ b/resources/lang/cs_CZ/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Řekněte nám více než "se objevilo Hups!"', 'include_logs' => 'Zahrnout protokoly chyb (viz výše).', 'what_did_you_do' => 'Řekněte nám, co jste dělali.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/de_DE/errors.php b/resources/lang/de_DE/errors.php index 8d9154d371..d291c0c5d2 100644 --- a/resources/lang/de_DE/errors.php +++ b/resources/lang/de_DE/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Sagen Sie uns mehr als "Da steht Hoppla!"', 'include_logs' => 'Fehlerprotokolle einschließen (siehe oben).', 'what_did_you_do' => 'Teilen Sie uns mit, was Sie getan haben.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/el_GR/errors.php b/resources/lang/el_GR/errors.php index 88a294f5d2..580465f27e 100644 --- a/resources/lang/el_GR/errors.php +++ b/resources/lang/el_GR/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Πείτε μας λίγα περισσότερα από το "μου λέει Ουπς!"', 'include_logs' => 'Συμπεριλάβετε αρχεία καταγραφής σφαλμάτων (δείτε παραπάνω).', 'what_did_you_do' => 'Πείτε μας τι κάνατε.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/en_GB/errors.php b/resources/lang/en_GB/errors.php index 4dac63fc73..b63c231504 100644 --- a/resources/lang/en_GB/errors.php +++ b/resources/lang/en_GB/errors.php @@ -47,4 +47,8 @@ return [ 'tell_more' => 'Tell us more than "it says Whoops!"', 'include_logs' => 'Include error logs (see above).', 'what_did_you_do' => 'Tell us what you were doing.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', + ]; diff --git a/resources/lang/es_ES/errors.php b/resources/lang/es_ES/errors.php index c6f79a85d7..c7db9d0c33 100644 --- a/resources/lang/es_ES/errors.php +++ b/resources/lang/es_ES/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Cuéntenos más que "Dice: Ups"', 'include_logs' => 'Incluye registros de errores (ver arriba).', 'what_did_you_do' => 'Cuéntenos lo que estaba haciendo.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/fi_FI/errors.php b/resources/lang/fi_FI/errors.php index ae9214e13d..3aa5f4c315 100644 --- a/resources/lang/fi_FI/errors.php +++ b/resources/lang/fi_FI/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Kerro meille enemmän kuin "se sanoo Whoops!"', 'include_logs' => 'Sisällytä virhelokit (katso yllä).', 'what_did_you_do' => 'Kerro meille mitä olit tekemässä.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/fr_FR/errors.php b/resources/lang/fr_FR/errors.php index 2d95001107..6f7b579c2b 100644 --- a/resources/lang/fr_FR/errors.php +++ b/resources/lang/fr_FR/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Dites-nous plus que "ça dit Oups !"', 'include_logs' => 'Incluez les logs d\'erreur (voir plus bas).', 'what_did_you_do' => 'Dites-nous ce que vous faisiez.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/hu_HU/errors.php b/resources/lang/hu_HU/errors.php index 3bd7ffb077..c72e009719 100644 --- a/resources/lang/hu_HU/errors.php +++ b/resources/lang/hu_HU/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Részletesebben írd le, mint hogy "azt írja hoppá, hiba történt!"', 'include_logs' => 'Hiba naplók hozzáadása (lásd fentebb).', 'what_did_you_do' => 'Meséld el mit csináltál.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/id_ID/errors.php b/resources/lang/id_ID/errors.php index eb3cc5d6ea..fd8d8b4420 100644 --- a/resources/lang/id_ID/errors.php +++ b/resources/lang/id_ID/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Beri tahu kami selain "kata Whoops!"', 'include_logs' => 'Sertakan log kesalahan (lihat di atas).', 'what_did_you_do' => 'Beritahu kami apa yang anda lakukan.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/it_IT/errors.php b/resources/lang/it_IT/errors.php index 5bb4f6a123..110f94b95f 100644 --- a/resources/lang/it_IT/errors.php +++ b/resources/lang/it_IT/errors.php @@ -47,4 +47,8 @@ return [ 'tell_more' => 'Dicci di più di "dice Oops!"', 'include_logs' => 'Includi i log degli errori (vedi sopra).', 'what_did_you_do' => 'Dicci cosa stavi facendo.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', + ]; diff --git a/resources/lang/ja_JP/errors.php b/resources/lang/ja_JP/errors.php index 1663fb6403..6d9157885f 100644 --- a/resources/lang/ja_JP/errors.php +++ b/resources/lang/ja_JP/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => '「おっと！」以上のことを教えてください。', 'include_logs' => 'エラーログを含めます (上記参照)。', 'what_did_you_do' => '何をしていたか教えてください。', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/nb_NO/errors.php b/resources/lang/nb_NO/errors.php index 1818adc8c6..b63c231504 100644 --- a/resources/lang/nb_NO/errors.php +++ b/resources/lang/nb_NO/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Tell us more than "it says Whoops!"', 'include_logs' => 'Include error logs (see above).', 'what_did_you_do' => 'Tell us what you were doing.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/nl_NL/errors.php b/resources/lang/nl_NL/errors.php index be08c75a14..2c602089b9 100644 --- a/resources/lang/nl_NL/errors.php +++ b/resources/lang/nl_NL/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Meer info dan "hij is stuk" gaarne', 'include_logs' => 'Inclusief foutlogs (zie hierboven).', 'what_did_you_do' => 'Zet er bij wat je deed.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/pl_PL/errors.php b/resources/lang/pl_PL/errors.php index f6df1fffdd..d742370b2d 100644 --- a/resources/lang/pl_PL/errors.php +++ b/resources/lang/pl_PL/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Powiedz nam więcej niż "Nie działa!"', 'include_logs' => 'Dołącz dzienniki błędów (patrz powyżej).', 'what_did_you_do' => 'Powiedz nam, co robisz.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/pt_BR/errors.php b/resources/lang/pt_BR/errors.php index 518d54e82b..372a458b34 100644 --- a/resources/lang/pt_BR/errors.php +++ b/resources/lang/pt_BR/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Nos diga mais do que "ele retorna Ops!"', 'include_logs' => 'Inclua os logs de erro (veja acima).', 'what_did_you_do' => 'Nos diga o que você estava fazendo.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/pt_PT/errors.php b/resources/lang/pt_PT/errors.php index 5d77831326..8e08a912db 100644 --- a/resources/lang/pt_PT/errors.php +++ b/resources/lang/pt_PT/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Diga-nos mais que "diz Whoops! no ecrã"', 'include_logs' => 'Incluir relatório de erros (ver acima).', 'what_did_you_do' => 'Diga-nos o que estava a fazer.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/ro_RO/errors.php b/resources/lang/ro_RO/errors.php index ded7ca7df1..e5b81e5f79 100644 --- a/resources/lang/ro_RO/errors.php +++ b/resources/lang/ro_RO/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Spune-ne mai mult decât „spune Whoops!”', 'include_logs' => 'Include jurnalele de erori (a se vedea mai sus).', 'what_did_you_do' => 'Spune-ne ce făceai.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/ru_RU/errors.php b/resources/lang/ru_RU/errors.php index d2ac620615..6c4cedb176 100644 --- a/resources/lang/ru_RU/errors.php +++ b/resources/lang/ru_RU/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Я хочу знать больше, чем просто "Упс!"', 'include_logs' => 'Прикрепить журналы ошибок (см. выше).', 'what_did_you_do' => 'Расскажите нам, что именно вы делали.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/sk_SK/errors.php b/resources/lang/sk_SK/errors.php index ac20b055d5..64b770e77b 100644 --- a/resources/lang/sk_SK/errors.php +++ b/resources/lang/sk_SK/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Povedzte nám viac, než "napísalo mi to Ups!"', 'include_logs' => 'Priložiť chybové záznamy (viď vyššie).', 'what_did_you_do' => 'Napíšte nám, čo ste robili, keď sa chyba vyskytla.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/sv_SE/errors.php b/resources/lang/sv_SE/errors.php index 83573e6841..df7084f2fc 100644 --- a/resources/lang/sv_SE/errors.php +++ b/resources/lang/sv_SE/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Berätta mer än "det står Hoppsan!"', 'include_logs' => 'Inkludera felloggar (se ovan).', 'what_did_you_do' => 'Berätta vad du gjorde.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/tr_TR/errors.php b/resources/lang/tr_TR/errors.php index 426fa5b5f8..38f5e8f589 100644 --- a/resources/lang/tr_TR/errors.php +++ b/resources/lang/tr_TR/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Tell us more than "it says Whoops!"', 'include_logs' => 'Include error logs (see above).', 'what_did_you_do' => 'Tell us what you were doing.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/vi_VN/errors.php b/resources/lang/vi_VN/errors.php index 0bb0f6487b..e38cfb9147 100644 --- a/resources/lang/vi_VN/errors.php +++ b/resources/lang/vi_VN/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Hãy nói với chúng tôi nhiều hơn "nó nói Rất tiếc!"', 'include_logs' => 'Bao gồm các bản ghi lỗi (xem ở trên).', 'what_did_you_do' => 'Hãy cho chúng tôi biết những gì bạn đã làm.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/zh_CN/errors.php b/resources/lang/zh_CN/errors.php index 9fab95ffba..44212a9987 100644 --- a/resources/lang/zh_CN/errors.php +++ b/resources/lang/zh_CN/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => '请提交给我们更多信息，而不仅仅是“网页提示说很抱歉”。', 'include_logs' => '请包含错误日志（见上文）。', 'what_did_you_do' => '告诉我们您进行了哪些操作。', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/resources/lang/zh_TW/errors.php b/resources/lang/zh_TW/errors.php index 1818adc8c6..b63c231504 100644 --- a/resources/lang/zh_TW/errors.php +++ b/resources/lang/zh_TW/errors.php @@ -47,5 +47,8 @@ return [ 'tell_more' => 'Tell us more than "it says Whoops!"', 'include_logs' => 'Include error logs (see above).', 'what_did_you_do' => 'Tell us what you were doing.', + 'offline_header' => 'You are probably offline', + 'offline_unreachable' => 'Firefly III is unreachable. Your device is currently offline or the server is not working.', + 'offline_github' => 'If you are sure both your device and the server are online, please open a ticket on GitHub.', ]; diff --git a/sonar-project.properties b/sonar-project.properties index 8fec489bf2..7761bbfa1f 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ sonar.projectKey=firefly-iii -sonar.projectVersion=5.6.0-alpha.2 +sonar.projectVersion=5.6.0 sonar.sources=app,bootstrap,database,resources/assets,resources/views,routes,tests,frontend/src/components,frontend/src/pages sonar.login=2859ca0fb90d8419e211190a8892b3e1721244cb sonar.sourceEncoding=UTF-8 diff --git a/yarn.lock b/yarn.lock index 5edf229ea9..60a53264c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1047,9 +1047,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*": - version "16.9.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" - integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== + version "16.9.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.2.tgz#81f5a039d6ed1941f8cc57506c74e7c2b8fc64b9" + integrity sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1728,9 +1728,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001252, caniuse-lite@^1.0.30001254: - version "1.0.30001257" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz#150aaf649a48bee531104cfeda57f92ce587f6e5" - integrity sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA== + version "1.0.30001258" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz#b604eed80cc54a578e4bf5a02ae3ed49f869d252" + integrity sha512-RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1835,9 +1835,9 @@ clone-deep@^4.0.1: shallow-clone "^3.0.0" collect.js@^4.28.5: - version "4.28.6" - resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.28.6.tgz#7fb75ae93b8198f7bb88461e263ea09744d0c56b" - integrity sha512-NAyuk1DnCotRaDZIS5kJ4sptgkwOeYqElird10yziN5JBuwYOGkOTguhNcPn5g344IfylZecxNYZAVXgv19p5Q== + version "4.29.0" + resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.29.0.tgz#2fecc535b5e5712a5c7eeaa2c2d510f3113ec423" + integrity sha512-yhgGYEsLEcqnLT1NmRlN1+1euoz9SDhxQ4QyDhWYsKoWsg7252PKA5++dWaDs8mdFxbkmXDXQUaHXI9J2eTPkQ== color-convert@^1.9.0: version "1.9.3" @@ -2396,9 +2396,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.830: - version "1.3.840" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.840.tgz#3f2a1df97015d9b1db5d86a4c6bd4cdb920adcbb" - integrity sha512-yRoUmTLDJnkIJx23xLY7GbSvnmDCq++NSuxHDQ0jiyDJ9YZBUGJcrdUqm+ZwZFzMbCciVzfem2N2AWiHJcWlbw== + version "1.3.842" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.842.tgz#641e414012dded277468892c0156cb01984f4f6f" + integrity sha512-P/nDMPIYdb2PyqCQwhTXNi5JFjX1AsDVR0y6FrHw752izJIAJ+Pn5lugqyBq4tXeRSZBMBb2ZGvRGB1djtELEQ== elliptic@^6.5.3: version "6.5.4" @@ -5424,9 +5424,9 @@ webpack-sources@^3.2.0: integrity sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA== webpack@^5.38.1: - version "5.52.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.52.1.tgz#2dc1d9029ecb7acfb80da7bf67baab67baa517a7" - integrity sha512-wkGb0hLfrS7ML3n2xIKfUIwHbjB6gxwQHyLmVHoAqEQBw+nWo+G6LoHL098FEXqahqximsntjBLuewStrnJk0g== + version "5.53.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.53.0.tgz#f463cd9c6fc1356ae4b9b7ac911fd1f5b2df86af" + integrity sha512-RZ1Z3z3ni44snoWjfWeHFyzvd9HMVYDYC5VXmlYUT6NWgEOWdCNpad5Fve2CzzHoRED7WtsKe+FCyP5Vk4pWiQ== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50"