kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/5.3.2' into main

Browse Source
This commit is contained in:
James Cole
2020-07-13 16:03:36 +02:00
parent ac607483aa f2dcb108e8
commit 0ba03be9a3
8 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/FireflyConfig.php
View File

@@ -87,8 +87,8 @@ class FireflyConfig
/** @var Configuration $config */ /** @var Configuration $config */
$config = Configuration::where('name', $name)->first(['id', 'name', 'data']); $config = Configuration::where('name', $name)->first(['id', 'name', 'data']);
} catch (QueryException|Exception $e) { } catch (QueryException|Exception $e) {
Log::error(sprintf('Query exception while polling for config var: %s', $e->getMessage())); //Log::error(sprintf('Query exception while polling for config var: %s', $e->getMessage()));
Log::error($e->getTraceAsString()); //Log::error($e->getTraceAsString());
throw new FireflyException(sprintf('Could not poll the database: %s', $e->getMessage())); throw new FireflyException(sprintf('Could not poll the database: %s', $e->getMessage()));
} }

6
app/Support/System/GeneratesInstallationId.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\System; namespace FireflyIII\Support\System;
use FireflyIII\Exceptions\FireflyException;
use Log; use Log;
use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Uuid;
@@ -37,7 +38,12 @@ trait GeneratesInstallationId
*/ */
protected function generateInstallationId(): void protected function generateInstallationId(): void
{ {
try {
$config = app('fireflyconfig')->get('installation_id', null); $config = app('fireflyconfig')->get('installation_id', null);
} catch(FireflyException $e) {
Log::info('Could not create or generate installation ID. Do not continue.');
return;
}
// delete if wrong UUID: // delete if wrong UUID:
if (null !== $config && 'b2c27d92-be90-5c10-8589-005df5b314e6' === $config->data) { if (null !== $config && 'b2c27d92-be90-5c10-8589-005df5b314e6' === $config->data) {

6
changelog.md
View File

@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [5.3.2 (API 1.3.0)] - 2020-07-13
### Fixed
- Issue when installing Firefly III using composer.
- Issue when installing Firefly III using the latest Docker image.
## [5.3.1 (API 1.3.0)] - 2020-07-12 ## [5.3.1 (API 1.3.0)] - 2020-07-12
### Added ### Added

32
composer.lock generated
View File

@@ -6103,26 +6103,26 @@
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
"version": "2.2.2", "version": "2.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
"reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15" "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15", "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5",
"reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15", "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-libxml": "*", "ext-libxml": "*",
"php": "^5.5 || ^7.0", "php": "^5.5 || ^7.0 || ^8.0",
"symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0" "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@@ -6148,7 +6148,7 @@
], ],
"description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2019-10-24T08:53:34+00:00" "time": "2020-07-13T06:12:54+00:00"
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
@@ -9672,23 +9672,23 @@
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
"version": "1.1.3", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/theseer/tokenizer.git", "url": "https://github.com/theseer/tokenizer.git",
"reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" "reference": "75a63c33a8577608444246075ea0af0d052e452a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
"reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "reference": "75a63c33a8577608444246075ea0af0d052e452a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"php": "^7.0" "php": "^7.2 || ^8.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -9708,7 +9708,13 @@
} }
], ],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"time": "2019-06-13T22:48:21+00:00" "funding": [
{
"url": "https://github.com/theseer",
"type": "github"
}
],
"time": "2020-07-12T23:59:07+00:00"
}, },
{ {
"name": "vimeo/psalm", "name": "vimeo/psalm",

2
config/firefly.php
View File

@@ -143,7 +143,7 @@ return [
], ],
//'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'), //'encryption' => null === env('USE_ENCRYPTION') || true === env('USE_ENCRYPTION'),
'version' => '5.3.1', 'version' => '5.3.2',
'api_version' => '1.3.0', 'api_version' => '1.3.0',
'db_version' => 15, 'db_version' => 15,
'maxUploadSize' => 1073741824, // 1 GB 'maxUploadSize' => 1073741824, // 1 GB

60
resources/lang/pl_PL/firefly.php
View File

@@ -625,44 +625,44 @@ return [
'optional_field_meta_data' => 'Opcjonalne metadane', 'optional_field_meta_data' => 'Opcjonalne metadane',
// profile: // profile:
'delete_stuff_header' => 'Delete data from Firefly III', 'delete_stuff_header' => 'Usuń dane z Firefly III',
'permanent_delete_stuff' => 'Uważaj z tymi przyciskami. Usuwanie rzeczy jest trwałe.', 'permanent_delete_stuff' => 'Uważaj z tymi przyciskami. Usuwanie rzeczy jest trwałe.',
'other_sessions_logged_out' => 'All your other sessions have been logged out.', 'other_sessions_logged_out' => 'All your other sessions have been logged out.',
'delete_all_budgets' => 'Skasuj WSZYSTKIE budżety', 'delete_all_budgets' => 'Skasuj WSZYSTKIE budżety',
'delete_all_categories' => 'Skasuj WSZYSTKIE kategorie', 'delete_all_categories' => 'Skasuj WSZYSTKIE kategorie',
'delete_all_tags' => 'Skasuj WSZYSTKIE tagi', 'delete_all_tags' => 'Skasuj WSZYSTKIE tagi',
'delete_all_bills' => 'Delete ALL your bills', 'delete_all_bills' => 'Usuń WSZYSTKIE rachunki',
'delete_all_piggy_banks' => 'Delete ALL your piggy banks', 'delete_all_piggy_banks' => 'Usuń WSZYSTKIE skarbonki',
'delete_all_rules' => 'Delete ALL your rules', 'delete_all_rules' => 'Usuń WSZYSTKIE reguły',
'delete_all_recurring' => 'Delete ALL your recurring transactions', 'delete_all_recurring' => 'Usuń WSZYSTKIE transakcje cykliczne',
'delete_all_object_groups' => 'Delete ALL your object groups', 'delete_all_object_groups' => 'Usuń WSZYSTKIE grupy obiektów',
'delete_all_accounts' => 'Delete ALL your accounts', 'delete_all_accounts' => 'Usuń WSZYSTKIE konta',
'delete_all_asset_accounts' => 'Delete ALL your asset accounts', 'delete_all_asset_accounts' => 'Usuń WSZYSTKIE konta aktywów',
'delete_all_expense_accounts' => 'Delete ALL your expense accounts', 'delete_all_expense_accounts' => 'Usuń WSZYSTKIE konta wydatków',
'delete_all_revenue_accounts' => 'Delete ALL your revenue accounts', 'delete_all_revenue_accounts' => 'Usuń WSZYSTKIE konta przychodów',
'delete_all_liabilities' => 'Delete ALL your liabilities', 'delete_all_liabilities' => 'Usuń WSZYSTKIE swoje zobowiązania',
'delete_all_transactions' => 'Delete ALL your transactions', 'delete_all_transactions' => 'Usuń WSZYSTKIE transakcje',
'delete_all_withdrawals' => 'Delete ALL your withdrawals', 'delete_all_withdrawals' => 'Usuń WSZYSTKIE wydatki',
'delete_all_deposits' => 'Delete ALL your deposits', 'delete_all_deposits' => 'Usuń WSZYSTKIE wpłaty',
'delete_all_transfers' => 'Delete ALL your transfers', 'delete_all_transfers' => 'Usuń WSZYSTKIE przelewy',
'also_delete_transactions' => 'Deleting accounts will also delete ALL associated withdrawals, deposits and transfers!', 'also_delete_transactions' => 'Usunięcie kont spowoduje również usunięcie WSZYSTKICH powiązanych wydatków, wpłat i transferów!',
'deleted_all_budgets' => 'Usunięto wszystkie budżety', 'deleted_all_budgets' => 'Usunięto wszystkie budżety',
'deleted_all_categories' => 'Usunięto wszystkie kategorie', 'deleted_all_categories' => 'Usunięto wszystkie kategorie',
'deleted_all_tags' => 'Usunięto wszystkie tagi', 'deleted_all_tags' => 'Usunięto wszystkie tagi',
'deleted_all_bills' => 'All bills have been deleted', 'deleted_all_bills' => 'Wszystkie rachunki zostały usunięte',
'deleted_all_piggy_banks' => 'All piggy banks have been deleted', 'deleted_all_piggy_banks' => 'Wszystkie skarbonki zostały usunięte',
'deleted_all_rules' => 'All rules and rule groups have been deleted', 'deleted_all_rules' => 'Wszystkie reguły i grupy reguł zostały usunięte',
'deleted_all_object_groups' => 'All groups have been deleted', 'deleted_all_object_groups' => 'Wszystkie grupy zostały usunięte',
'deleted_all_accounts' => 'All accounts have been deleted', 'deleted_all_accounts' => 'Wszystkie konta zostały usunięte',
'deleted_all_asset_accounts' => 'All asset accounts have been deleted', 'deleted_all_asset_accounts' => 'Wszystkie konta aktywów zostały usunięte',
'deleted_all_expense_accounts' => 'All expense accounts have been deleted', 'deleted_all_expense_accounts' => 'Wszystkie konta wydatków zostały usunięte',
'deleted_all_revenue_accounts' => 'All revenue accounts have been deleted', 'deleted_all_revenue_accounts' => 'Wszystkie konta przychodów zostały usunięte',
'deleted_all_liabilities' => 'All liabilities have been deleted', 'deleted_all_liabilities' => 'Wszystkie zobowiązania zostały usunięte',
'deleted_all_transactions' => 'All transactions have been deleted', 'deleted_all_transactions' => 'Wszystkie transakcje zostały usunięte',
'deleted_all_withdrawals' => 'All withdrawals have been deleted', 'deleted_all_withdrawals' => 'Wszystkie wydatki zostały usunięte',
'deleted_all_deposits' => 'All deposits have been deleted', 'deleted_all_deposits' => 'Wszystkie wpłaty zostały usunięte',
'deleted_all_transfers' => 'All transfers have been deleted', 'deleted_all_transfers' => 'Wszystkie przelewy zostały usunięte',
'deleted_all_recurring' => 'All recurring transactions have been deleted', 'deleted_all_recurring' => 'Wszystkie cykliczne transakcje zostały usunięte',
'change_your_password' => 'Zmień swoje hasło', 'change_your_password' => 'Zmień swoje hasło',
'delete_account' => 'Usuń konto', 'delete_account' => 'Usuń konto',
'current_password' => 'Bieżące hasło', 'current_password' => 'Bieżące hasło',

2
resources/lang/pl_PL/validation.php
View File

@@ -198,7 +198,7 @@ return [
'generic_invalid_destination' => 'Nie możesz użyć tego konta jako konta docelowego.', 'generic_invalid_destination' => 'Nie możesz użyć tego konta jako konta docelowego.',
'gte.numeric' => ':attribute musi być większy lub równy :value.', 'gte.numeric' => ':attribute musi być większy lub równy :value.',
'gt.numeric' => 'The :attribute must be greater than :value.', 'gt.numeric' => ':attribute musi być większy niż :value.',
'gte.file' => ':attribute musi mieć rozmiar większy niż lub równy :value kilobajtów.', 'gte.file' => ':attribute musi mieć rozmiar większy niż lub równy :value kilobajtów.',
'gte.string' => ':attribute musi mieć :value lub więcej znaków.', 'gte.string' => ':attribute musi mieć :value lub więcej znaków.',
'gte.array' => ':attribute musi mieć :value lub więcej elementów.', 'gte.array' => ':attribute musi mieć :value lub więcej elementów.',

6
yarn.lock
View File

@@ -1777,9 +1777,9 @@ code-point-at@^1.0.0:
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
collect.js@^4.12.8: collect.js@^4.12.8:
version "4.27.4" version "4.28.0"
resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.27.4.tgz#210c70010c49350fd8b91bbff80a7194407d2c29" resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.28.0.tgz#3c2c96e8e53b078c8cf00ee6d1db08d1622a316e"
integrity sha512-+umY6X+mb1qWrAsu9S2c2jyIK7nlKf1vM7E7CH6E1cm4SeBWxCGsGd1vZZ2YHP9uBfAbgHWrsvEs3g3yUodxbA== integrity sha512-6MtSO6wOyJKNWW+mwPV0v/Lw3jvbFyRWPdJoVYkKDIebTRxHDgDXLyHGr8i1zwJVSk9rMwbYrAJEvfZA08e8dg==
collection-visit@^1.0.0: collection-visit@^1.0.0:
version "1.0.0" version "1.0.0"