IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-03-04

Browse Source
This commit is contained in:
github-actions 2024-03-04 01:30:26 +01:00
parent ea573e9434
commit 1ef7239276
15 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Json/ReconcileController.php
View File

@ -75,7 +75,6 @@ class ReconcileController extends Controller
$clearedAmount = '0'; $clearedAmount = '0';
$route = ''; $route = '';
if (null === $start && null === $end) { if (null === $start && null === $end) {
throw new FireflyException('Invalid dates submitted.'); throw new FireflyException('Invalid dates submitted.');
} }

59
composer.lock generated
View File

@ -542,16 +542,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.8.2", "version": "3.8.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "a19a1d05ca211f41089dffcc387733a6875196cb" "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/a19a1d05ca211f41089dffcc387733a6875196cb", "url": "https://api.github.com/repos/doctrine/dbal/zipball/db922ba9436b7b18a23d1653a0b41ff2369ca41c",
"reference": "a19a1d05ca211f41089dffcc387733a6875196cb", "reference": "db922ba9436b7b18a23d1653a0b41ff2369ca41c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -567,12 +567,12 @@
"doctrine/coding-standard": "12.0.0", "doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1", "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1", "jetbrains/phpstorm-stubs": "2023.1",
"phpstan/phpstan": "1.10.57", "phpstan/phpstan": "1.10.58",
"phpstan/phpstan-strict-rules": "^1.5", "phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "9.6.16", "phpunit/phpunit": "9.6.16",
"psalm/plugin-phpunit": "0.18.4", "psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1", "slevomat/coding-standard": "8.13.1",
"squizlabs/php_codesniffer": "3.8.1", "squizlabs/php_codesniffer": "3.9.0",
"symfony/cache": "^5.4|^6.0|^7.0", "symfony/cache": "^5.4|^6.0|^7.0",
"symfony/console": "^4.4|^5.4|^6.0|^7.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0",
"vimeo/psalm": "4.30.0" "vimeo/psalm": "4.30.0"
@ -635,7 +635,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.8.2" "source": "https://github.com/doctrine/dbal/tree/3.8.3"
}, },
"funding": [ "funding": [
{ {
@ -651,7 +651,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-02-12T18:36:36+00:00" "time": "2024-03-03T15:55:06+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
@ -4476,16 +4476,16 @@
}, },
{ {
"name": "phpseclib/phpseclib", "name": "phpseclib/phpseclib",
"version": "3.0.36", "version": "3.0.37",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpseclib/phpseclib.git", "url": "https://github.com/phpseclib/phpseclib.git",
"reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b" "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c2fb5136162d4be18fdd4da9980696f3aee96d7b", "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
"reference": "c2fb5136162d4be18fdd4da9980696f3aee96d7b", "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4566,7 +4566,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpseclib/phpseclib/issues", "issues": "https://github.com/phpseclib/phpseclib/issues",
"source": "https://github.com/phpseclib/phpseclib/tree/3.0.36" "source": "https://github.com/phpseclib/phpseclib/tree/3.0.37"
}, },
"funding": [ "funding": [
{ {
@ -4582,7 +4582,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-02-26T05:13:14+00:00" "time": "2024-03-03T02:14:58+00:00"
}, },
{ {
"name": "pragmarx/google2fa", "name": "pragmarx/google2fa",
@ -9919,20 +9919,21 @@
}, },
{ {
"name": "phar-io/manifest", "name": "phar-io/manifest",
"version": "2.0.3", "version": "2.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phar-io/manifest.git", "url": "https://github.com/phar-io/manifest.git",
"reference": "97803eca37d319dfa7826cc2437fc020857acb53" "reference": "54750ef60c58e43759730615a392c31c80e23176"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
"reference": "97803eca37d319dfa7826cc2437fc020857acb53", "reference": "54750ef60c58e43759730615a392c31c80e23176",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-libxml": "*",
"ext-phar": "*", "ext-phar": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"phar-io/version": "^3.0.1", "phar-io/version": "^3.0.1",
@ -9973,9 +9974,15 @@
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"support": { "support": {
"issues": "https://github.com/phar-io/manifest/issues", "issues": "https://github.com/phar-io/manifest/issues",
"source": "https://github.com/phar-io/manifest/tree/2.0.3" "source": "https://github.com/phar-io/manifest/tree/2.0.4"
}, },
"time": "2021-07-20T11:28:43+00:00" "funding": [
{
"url": "https://github.com/theseer",
"type": "github"
}
],
"time": "2024-03-03T12:33:53+00:00"
}, },
{ {
"name": "phar-io/version", "name": "phar-io/version",
@ -11872,16 +11879,16 @@
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",
"version": "1.2.2", "version": "1.2.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/theseer/tokenizer.git", "url": "https://github.com/theseer/tokenizer.git",
"reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
"reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11910,7 +11917,7 @@
"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",
"support": { "support": {
"issues": "https://github.com/theseer/tokenizer/issues", "issues": "https://github.com/theseer/tokenizer/issues",
"source": "https://github.com/theseer/tokenizer/tree/1.2.2" "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
}, },
"funding": [ "funding": [
{ {
@ -11918,7 +11925,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-11-20T00:12:19+00:00" "time": "2024-03-03T12:36:25+00:00"
} }
], ],
"aliases": [], "aliases": [],

2
config/firefly.php
View File

@ -115,7 +115,7 @@ return [
'handle_debts' => true, 'handle_debts' => true,
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.1.10', 'version' => 'develop/2024-03-04',
'api_version' => '2.0.12', 'api_version' => '2.0.12',
'db_version' => 23, 'db_version' => 23,

2
public/v1/js/create_transaction.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/profile.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/create.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/edit.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/index.js
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/webhooks/show.js
View File

File diff suppressed because one or more lines are too long

2
public/v2/i18n/de.json
View File

@ -2,7 +2,7 @@
"config": { "config": {
"html_language": "de", "html_language": "de",
"date_time_fns": "dd. MMM. yyyy um HH:mm:ss", "date_time_fns": "dd. MMM. yyyy um HH:mm:ss",
"date_time_fns_short": "dd. MMM. yyyy um HH:mm" "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
}, },
"firefly": { "firefly": {
"spent": "Ausgegeben", "spent": "Ausgegeben",

2
public/v2/i18n/de_DE.json
View File

@ -2,7 +2,7 @@
"config": { "config": {
"html_language": "de", "html_language": "de",
"date_time_fns": "dd. MMM. yyyy um HH:mm:ss", "date_time_fns": "dd. MMM. yyyy um HH:mm:ss",
"date_time_fns_short": "dd. MMM. yyyy um HH:mm" "date_time_fns_short": "MMMM do, yyyy @ HH:mm"
}, },
"firefly": { "firefly": {
"spent": "Ausgegeben", "spent": "Ausgegeben",

4
resources/assets/js/locales/de.json
View File

@ -5,8 +5,8 @@
"flash_warning": "Achtung!", "flash_warning": "Achtung!",
"flash_success": "Geschafft!", "flash_success": "Geschafft!",
"close": "Schlie\u00dfen", "close": "Schlie\u00dfen",
"select_dest_account": "Bitte einen g\u00fcltigen Zielkontonamen ausw\u00e4hlen oder eingeben", "select_dest_account": "Please select or type a valid destination account name",
"select_source_account": "Bitte einen g\u00fcltigen Quellkontonamen ausw\u00e4hlen oder eingeben", "select_source_account": "Please select or type a valid source account name",
"split_transaction_title": "Beschreibung der Splittbuchung", "split_transaction_title": "Beschreibung der Splittbuchung",
"errors_submission": "Bei Ihren Eingaben stimmt etwas nicht. Bitte \u00fcberpr\u00fcfen Sie die unten stehenden Fehler.", "errors_submission": "Bei Ihren Eingaben stimmt etwas nicht. Bitte \u00fcberpr\u00fcfen Sie die unten stehenden Fehler.",
"split": "Teilen", "split": "Teilen",

2
resources/lang/de_DE/config.php
View File

@ -64,7 +64,7 @@ return [
// 'date_time' => '%B %e, %Y, @ %T', // 'date_time' => '%B %e, %Y, @ %T',
'date_time_js' => 'Do MMMM YYYY um HH:mm:ss', 'date_time_js' => 'Do MMMM YYYY um HH:mm:ss',
'date_time_fns' => 'dd. MMM. yyyy um HH:mm:ss', 'date_time_fns' => 'dd. MMM. yyyy um HH:mm:ss',
'date_time_fns_short' => 'dd. MMM. yyyy um HH:mm', 'date_time_fns_short' => 'MMMM do, yyyy @ HH:mm',
// 'specific_day' => '%e %B %Y', // 'specific_day' => '%e %B %Y',
'specific_day_js' => 'D. MMMM YYYY', 'specific_day_js' => 'D. MMMM YYYY',

22
resources/lang/de_DE/firefly.php
View File

@ -317,8 +317,8 @@ return [
'update_new_version_alert' => 'Eine neue Version von Firefly III ist verfügbar. Sie verwenden :your_version, die neueste Version ist :new_version, die am :date veröffentlicht wurde.', 'update_new_version_alert' => 'Eine neue Version von Firefly III ist verfügbar. Sie verwenden :your_version, die neueste Version ist :new_version, die am :date veröffentlicht wurde.',
'update_version_beta' => 'Seien Sie vorsichtig bei der Verwendung dieser BETA-Version. Sie könnte noch Fehler enthaltern.', 'update_version_beta' => 'Seien Sie vorsichtig bei der Verwendung dieser BETA-Version. Sie könnte noch Fehler enthaltern.',
'update_version_alpha' => 'Seien Sie vorsichtig bei der Verwendung dieser APLPHA-Version. Sie kann Fehler enthaltern.', 'update_version_alpha' => 'Seien Sie vorsichtig bei der Verwendung dieser APLPHA-Version. Sie kann Fehler enthaltern.',
'update_current_dev_older' => 'Sie verwenden die Entwicklungsversion „:version”, die älter ist als die neueste Version :new_version. Bitte aktualisieren Sie!', 'update_current_dev_older' => 'You are running development release ":version", which is older than the latest release :new_version. Please update!',
'update_current_dev_newer' => 'Sie verwenden die Entwicklungsversion „:version”, die neuer ist als die letzte Version :new_version.', 'update_current_dev_newer' => 'You are running development release ":version", which is newer than the latest release :new_version.',
'update_current_version_alert' => 'Sie verwenden Version :version. Dies ist die neueste verfügbare Version.', 'update_current_version_alert' => 'Sie verwenden Version :version. Dies ist die neueste verfügbare Version.',
'update_newer_version_alert' => 'Sie verwenden :your_version. Ihre Version ist neuer als die neueste Version (:new_version).', 'update_newer_version_alert' => 'Sie verwenden :your_version. Ihre Version ist neuer als die neueste Version (:new_version).',
'update_check_error' => 'Bei der Suche nach Aktualisierungen ist ein Fehler aufgetreten: :error', 'update_check_error' => 'Bei der Suche nach Aktualisierungen ist ein Fehler aufgetreten: :error',
@ -896,12 +896,12 @@ return [
'rule_trigger_budget_is' => 'Budget ist „:trigger_value”', 'rule_trigger_budget_is' => 'Budget ist „:trigger_value”',
'rule_trigger_tag_is_choice' => 'Irgendein Schlagwort lautet..', 'rule_trigger_tag_is_choice' => 'Irgendein Schlagwort lautet..',
'rule_trigger_tag_is' => 'Irgendein Schlagwort lautet ":trigger_value"', 'rule_trigger_tag_is' => 'Irgendein Schlagwort lautet ":trigger_value"',
'rule_trigger_tag_contains_choice' => 'Beliebiges Schlagwort enthält …', 'rule_trigger_tag_contains_choice' => 'Any tag contains..',
'rule_trigger_tag_contains' => 'Beliebiges Schlagwort enthält „:trigger_value”', 'rule_trigger_tag_contains' => 'Any tag contains ":trigger_value"',
'rule_trigger_tag_ends_choice' => 'Beliebiges Schlagwort endet auf ...', 'rule_trigger_tag_ends_choice' => 'Any tag ends with..',
'rule_trigger_tag_ends' => 'Beliebiges Schlagwort endet auf „:trigger_value”', 'rule_trigger_tag_ends' => 'Any tag ends with ":trigger_value"',
'rule_trigger_tag_starts_choice' => 'Beliebiges Schlagwort beginnt mit ...', 'rule_trigger_tag_starts_choice' => 'Any tag starts with..',
'rule_trigger_tag_starts' => 'Beliebiges Schlagwort beginnt mit „:trigger_value”', 'rule_trigger_tag_starts' => 'Any tag starts with ":trigger_value"',
'rule_trigger_currency_is_choice' => 'Buchungswährung ist..', 'rule_trigger_currency_is_choice' => 'Buchungswährung ist..',
'rule_trigger_currency_is' => 'Buchungswährung ist „:trigger_value”', 'rule_trigger_currency_is' => 'Buchungswährung ist „:trigger_value”',
'rule_trigger_foreign_currency_is_choice' => 'Fremdwährung der Buchung ist..', 'rule_trigger_foreign_currency_is_choice' => 'Fremdwährung der Buchung ist..',
@ -1586,8 +1586,8 @@ return [
'submission_options' => 'Übermittlungsoptionen', 'submission_options' => 'Übermittlungsoptionen',
'apply_rules_checkbox' => 'Regeln anwenden', 'apply_rules_checkbox' => 'Regeln anwenden',
'fire_webhooks_checkbox' => 'Webhooks abfeuern', 'fire_webhooks_checkbox' => 'Webhooks abfeuern',
'select_source_account' => 'Bitte einen gültigen Quellkontonamen auswählen oder eingeben', 'select_source_account' => 'Please select or type a valid source account name',
'select_dest_account' => 'Bitte einen gültigen Zielkontonamen auswählen oder eingeben', 'select_dest_account' => 'Please select or type a valid destination account name',
// convert stuff: // convert stuff:
'convert_is_already_type_Withdrawal' => 'Diese Buchung ist bereits eine Ausgabe', 'convert_is_already_type_Withdrawal' => 'Diese Buchung ist bereits eine Ausgabe',
@ -2459,7 +2459,7 @@ return [
'block_code_bounced' => 'E-Mail-Nachricht(en) wurden abgewiesen', 'block_code_bounced' => 'E-Mail-Nachricht(en) wurden abgewiesen',
'block_code_expired' => 'Demo-Konto abgelaufen', 'block_code_expired' => 'Demo-Konto abgelaufen',
'no_block_code' => 'Kein Grund für Block oder Benutzer nicht blockiert', 'no_block_code' => 'Kein Grund für Block oder Benutzer nicht blockiert',
'demo_user_export' => 'Der Demo-Benutzer kann keine Daten exportieren', 'demo_user_export' => 'The demo user cannot export data',
'block_code_email_changed' => 'Der Benutzer hat die neue E-Mail-Adresse noch nicht bestätigt', 'block_code_email_changed' => 'Der Benutzer hat die neue E-Mail-Adresse noch nicht bestätigt',
'admin_update_email' => 'Im Gegensatz zur Profilseite wird der Benutzer NICHT benachrichtigt, dass seine E-Mail-Adresse geändert wurde!', 'admin_update_email' => 'Im Gegensatz zur Profilseite wird der Benutzer NICHT benachrichtigt, dass seine E-Mail-Adresse geändert wurde!',
'update_user' => 'Benutzer aktualisieren', 'update_user' => 'Benutzer aktualisieren',