From 7b3ca053a59210ca1d6e87562b29eca8fb554e7d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 9 Oct 2017 21:00:17 +0200 Subject: [PATCH 01/49] New translations firefly.php (Polish) --- resources/lang/pl_PL/firefly.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index 4e441c3bc5..ce0e0dd4f9 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -970,9 +970,9 @@ return [ 'this_deposit' => 'Ta wpłata', 'this_transfer' => 'Ten transfer', 'overview_for_link' => 'Przegląd dla typu łącza ":name"', - 'source_transaction' => 'Source transaction', - 'link_description' => 'Link description', - 'destination_transaction' => 'Destination transaction', + 'source_transaction' => 'Transakcja źródłowa', + 'link_description' => 'Opis łącza', + 'destination_transaction' => 'Transakcja docelowa', 'delete_journal_link' => 'Usuń powiązanie między :source a :destination', 'deleted_link' => 'Usunięto powiązanie', From ca548e166fd75642c52724f13d70054ab3b00366 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 08:20:07 +0200 Subject: [PATCH 02/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index 0fe735125b..0f891944bd 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -11,25 +11,25 @@ declare(strict_types=1); return [ // index - 'index_intro' => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.', - 'index_accounts-chart' => 'This chart shows the current balance of your asset accounts. You can select the accounts visible here in your preferences.', - 'index_box_out_holder' => 'This little box and the boxes next to this one will give you a quick overview of your financial situation.', - 'index_help' => 'If you ever need help with a page or a form, press this button.', - 'index_outro' => 'Most pages of Firefly III will start with a little tour like this one. Please contact me when you have questions or comments. Enjoy!', - 'index_sidebar-toggle' => 'To create new transactions, accounts or other things, use the menu under this icon.', + 'index_intro' => 'Wilkommen auf der Startseite von Firefly III. Bitte nehmen Sie sich die Zeit, um ein Gefühl dafür zu bekommen, wie Firefly III funktioniert.', + 'index_accounts-chart' => 'Dieses Diagramm zeigt den aktuellen Saldo Ihrer Anlagenkonten. Sie können die anzuzeigenden Konten in Ihren Einstellungen auswählen.', + 'index_box_out_holder' => 'Diese kleine und deren benachbarten Boxen geben Ihnen einen schnellen Überblick über Ihre finanzielle Situation.', + 'index_help' => 'Wenn Sie jemals Hilfe bei einer Seite oder einem Formular benötigen, drücken Sie diese Taste.', + 'index_outro' => 'Die meisten Seiten von Firefly III werden mit einer kleinen Tour wie dieser beginnen. Bitte kontaktieren Sie mich, wenn Sie Fragen oder Kommentare haben. Viel Spaß!', + 'index_sidebar-toggle' => 'Um neue Transaktionen, Konten oder andere Dinge zu erstellen, verwenden Sie das Menü unter diesem Symbol.', // create account: - 'accounts_create_iban' => 'Give your accounts a valid IBAN. This could make a data import very easy in the future.', - 'accounts_create_asset_opening_balance' => 'Assets accounts may have an "opening balance", indicating the start of this account\'s history in Firefly.', - 'accounts_create_asset_currency' => 'Firefly III supports multiple currencies. Asset accounts have one main currency, which you must set here.', - 'accounts_create_asset_virtual' => 'It can sometimes help to give your account a virtual balance: an extra amount always added to or removed from the actual balance.', + 'accounts_create_iban' => 'Geben Sie Ihren Konten eine gültige IBAN. Dies könnte einen Datenimport in Zukunft sehr einfach machen.', + 'accounts_create_asset_opening_balance' => 'Anlagekonten können ein "Eröffnungsguthaben" haben, welches den Beginn der Historie dieses Kontos in Firefly angibt.', + 'accounts_create_asset_currency' => 'Firefly III unterstützt mehrere Währungen. Anlagenkonten haben eine Hauptwährung, die Sie hier einstellen müssen.', + 'accounts_create_asset_virtual' => 'Es kann manchmal helfen, Ihrem Konto ein virtuelles Gleichgewicht zu geben: eine zusätzliche Menge, die dem tatsächlichen Kontostand immer hinzugefügt oder daraus entfernt wird.', // budgets index - 'budgets_index_intro' => 'Budgets are used to manage your finances and form one of the core functions of Firefly III.', - 'budgets_index_set_budget' => 'Set your total budget for every period so Firefly can tell you if you have budgeted all available money.', - 'budgets_index_see_expenses_bar' => 'Spending money will slowly fill this bar.', - 'budgets_index_navigate_periods' => 'Navigate through periods to easily set budgets ahead of time.', - 'budgets_index_new_budget' => 'Create new budgets as you see fit.', + 'budgets_index_intro' => 'Mit Budgets verwalten Sie Ihre Finanzen und bilden damit eine der Kernfunktionen von Firefly III.', + 'budgets_index_set_budget' => 'Stellen Sie Ihr Gesamtbudget für jeden Zeitraum ein, damit Firefly Ihnen mitteilen kann, ob Sie das verfügbare Geld budgetiert haben.', + 'budgets_index_see_expenses_bar' => 'Dieser Balken wird sich langsam füllen, wenn Sie Geld ausgeben.', + 'budgets_index_navigate_periods' => 'Navigieren Sie durch Zeiträume, um die Budgets im Voraus zu setzen.', + 'budgets_index_new_budget' => 'Erstellen Sie neue Budgets, wie Sie es für richtig halten.', 'budgets_index_list_of_budgets' => 'Use this table to set the amounts for each budget and see how you are doing.', 'budgets_index_outro' => 'To learn more about budgeting, checkout the help icon in the top right corner.', From 1187169dbd4206ae56d814c011c670f557602d5c Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 08:20:08 +0200 Subject: [PATCH 03/49] New translations bank.php (German) --- resources/lang/de_DE/bank.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/de_DE/bank.php b/resources/lang/de_DE/bank.php index 11f05b3785..c50588e153 100644 --- a/resources/lang/de_DE/bank.php +++ b/resources/lang/de_DE/bank.php @@ -1,6 +1,6 @@ 'Prerequisites for an import from bunq', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app.', + 'bunq_prerequisites_title' => 'Voraussetzungen für einen Import von bunq', + 'bunq_prerequisites_text' => 'Um aus bunq importieren zu können, benötigen Sie einen API-Schlüssel. Sie können dies über die App tun.', ]; \ No newline at end of file From 055b80cf7ab1f069bd76c74381facc3f84df7eb2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 08:30:07 +0200 Subject: [PATCH 04/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index 0f891944bd..07095f8a31 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -30,30 +30,30 @@ return [ 'budgets_index_see_expenses_bar' => 'Dieser Balken wird sich langsam füllen, wenn Sie Geld ausgeben.', 'budgets_index_navigate_periods' => 'Navigieren Sie durch Zeiträume, um die Budgets im Voraus zu setzen.', 'budgets_index_new_budget' => 'Erstellen Sie neue Budgets, wie Sie es für richtig halten.', - 'budgets_index_list_of_budgets' => 'Use this table to set the amounts for each budget and see how you are doing.', - 'budgets_index_outro' => 'To learn more about budgeting, checkout the help icon in the top right corner.', + 'budgets_index_list_of_budgets' => 'Verwenden Sie diese Tabelle, um die Beträge für jedes Budget festzulegen und einen Überblick zu erhalten.', + 'budgets_index_outro' => 'Um mehr über die Budgetierung zu erfahren, klicken Sie auf das Hilfesymbol in der oberen rechten Ecke.', // reports (index) - 'reports_index_intro' => 'Use these reports to get detailed insights in your finances.', - 'reports_index_inputReportType' => 'Pick a report type. Check out the help pages to see what each report shows you.', - 'reports_index_inputAccountsSelect' => 'You can exclude or include asset accounts as you see fit.', - 'reports_index_inputDateRange' => 'The selected date range is entirely up to you: from one day to 10 years.', - 'reports_index_extra-options-box' => 'Depending on the report you have selected, you can select extra filters and options here. Watch this box when you change report types.', + 'reports_index_intro' => 'Verwenden Sie diese Reports, um detaillierte Einblicke in Ihre Finanzen zu erhalten.', + 'reports_index_inputReportType' => 'Wählen Sie einen Berichtstyp aus. Sehen Sie sich die Hilfeseiten an, um zu sehen, was jeder Bericht Ihnen zeigt.', + 'reports_index_inputAccountsSelect' => 'Sie können Anlagekonten ausschließen oder einbeziehen, wie Sie es für richtig halten.', + 'reports_index_inputDateRange' => 'Der gewählte Datumsbereich liegt ganz bei Ihnen: von einem Tag bis 10 Jahre.', + 'reports_index_extra-options-box' => 'Abhängig von dem ausgewählten Bericht können Sie hier zusätzliche Filter und Optionen auswählen. Sehen Sie sich dieses Feld an, wenn Sie Berichtstypen ändern.', // reports (reports) - 'reports_report_default_intro' => 'This report will give you a quick and comprehensive overview of your finances. If you wish to see anything else, please don\'t hestitate to contact me!', - 'reports_report_audit_intro' => 'This report will give you detailed insights in your asset accounts.', - 'reports_report_audit_optionsBox' => 'Use these check boxes to show or hide the columns you are interested in.', + 'reports_report_default_intro' => 'Dieser Bericht gibt Ihnen einen schnellen und umfassenden Überblick über Ihre Finanzen. Wenn Sie etwas anderes sehen möchten, kontaktieren Sie mich bitte nicht!', + 'reports_report_audit_intro' => 'In diesem Bericht erhalten Sie detaillierte Einblicke in Ihre Bestandskonten.', + 'reports_report_audit_optionsBox' => 'Verwenden Sie diese Kontrollkästchen, um die Spalten anzuzeigen oder auszublenden, an denen Sie interessiert sind.', - 'reports_report_category_intro' => 'This report will give you insight in one or multiple categories.', - 'reports_report_category_pieCharts' => 'These charts will give you insight in expenses and income per category or per account.', - 'reports_report_category_incomeAndExpensesChart' => 'This chart shows your expenses and income per category.', + 'reports_report_category_intro' => 'Dieser Bericht gibt Ihnen Einblick in eine oder mehrere Kategorien.', + 'reports_report_category_pieCharts' => 'Diese Diagramme geben Ihnen Einblick in Ausgaben und Einnahmen pro Kategorie oder pro Konto.', + 'reports_report_category_incomeAndExpensesChart' => 'Diese Tabelle zeigt Ihre Ausgaben und Einnahmen pro Kategorie.', - 'reports_report_tag_intro' => 'This report will give you insight in one or multiple tags.', - 'reports_report_tag_pieCharts' => 'These charts will give you insight in expenses and income per tag, account, category or budget.', - 'reports_report_tag_incomeAndExpensesChart' => 'This chart shows your expenses and income per tag.', + 'reports_report_tag_intro' => 'Dieser Bericht gibt Ihnen Einblick in eine oder mehrere Tags.', + 'reports_report_tag_pieCharts' => 'Diese Diagramme geben Ihnen Einblick in Ausgaben und Einnahmen pro Tag, Konto, Kategorie oder budget.', + 'reports_report_tag_incomeAndExpensesChart' => 'Diese Tabelle zeigt Ihre Ausgaben und Einnahmen pro Tag.', - 'reports_report_budget_intro' => 'This report will give you insight in one or multiple budgets.', + 'reports_report_budget_intro' => 'Dieser Bericht gibt Ihnen Einblick in eine oder mehrere Budgets.', 'reports_report_budget_pieCharts' => 'These charts will give you insight in expenses per budget or per account.', 'reports_report_budget_incomeAndExpensesChart' => 'This chart shows your expenses per budget.', From 41d12f4f2f9ead05ea28cfb8986366c798328f0b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 08:40:16 +0200 Subject: [PATCH 05/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index 07095f8a31..5ebfac5a8e 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -54,20 +54,20 @@ return [ 'reports_report_tag_incomeAndExpensesChart' => 'Diese Tabelle zeigt Ihre Ausgaben und Einnahmen pro Tag.', 'reports_report_budget_intro' => 'Dieser Bericht gibt Ihnen Einblick in eine oder mehrere Budgets.', - 'reports_report_budget_pieCharts' => 'These charts will give you insight in expenses per budget or per account.', - 'reports_report_budget_incomeAndExpensesChart' => 'This chart shows your expenses per budget.', + 'reports_report_budget_pieCharts' => 'Diese Diagramme geben Ihnen Einblick in Ausgaben und Einnahmen pro Budget oder pro Konto.', + 'reports_report_budget_incomeAndExpensesChart' => 'Diese Tabelle zeigt Ihre Ausgaben und Einnahmen pro Budget.', // create transaction - 'transactions_create_switch_box' => 'Use these buttons to quickly switch the type of transaction you wish to save.', - 'transactions_create_ffInput_category' => 'You can freely type in this field. Previously created categories will be suggested.', - 'transactions_create_withdrawal_ffInput_budget' => 'Link your withdrawal to a budget for better financial control.', - 'transactions_create_withdrawal_currency_dropdown_amount' => 'Use this dropdown when your withdrawal is in another currency.', - 'transactions_create_deposit_currency_dropdown_amount' => 'Use this dropdown when your deposit is in another currency.', - 'transactions_create_transfer_ffInput_piggy_bank_id' => 'Select a piggy bank and link this transfer to your savings.', + 'transactions_create_switch_box' => 'Verwenden Sie diese Schaltflächen, um schnell den Typ der Transaktion zu ändern, die Sie speichern möchten.', + 'transactions_create_ffInput_category' => 'Dies ist ein Freitextfeld. Zuvor erstellte Kategorien werden vorgeschlagen.', + 'transactions_create_withdrawal_ffInput_budget' => 'Verbinden Sie Ihre Abhebung mit einem Budget für eine bessere Kontrolle Ihrer Finanzen.', + 'transactions_create_withdrawal_currency_dropdown_amount' => 'Verwenden Sie dieses Dropdown, wenn ihre Abbuchung in einer anderen Währung ist.', + 'transactions_create_deposit_currency_dropdown_amount' => 'Verwenden Sie dieses Dropdown, wenn ihre Einzahlung in einer anderen Währung ist.', + 'transactions_create_transfer_ffInput_piggy_bank_id' => 'Wählen Sie ein Sparschwein aus und verbinden Sie diese Überweisung mit Ihren Ersparnissen.', // piggy banks index: - 'piggy-banks_index_saved' => 'This field shows you how much you\'ve saved in each piggy bank.', - 'piggy-banks_index_button' => 'Next to this progress bar are two buttons (+ and -) to add or remove money from each piggy bank.', + 'piggy-banks_index_saved' => 'Dieses Feld zeigt Ihnen, wie viel Sie in jedem Sparschwein gespart haben.', + 'piggy-banks_index_button' => 'Neben diesem Fortschrittsbalken befinden sich zwei Buttons (+ und -), um Geld von jedem Sparschwein hinzuzufügen oder zu entfernen.', 'piggy-banks_index_accountStatus' => 'For each asset account with at least one piggy bank the status is listed in this table.', // create piggy From c5de4338e1d385c2ea9a01f2641535c6f2452ac2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 08:50:18 +0200 Subject: [PATCH 06/49] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 944c0a9920..c2717c7cb8 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -128,19 +128,19 @@ return [ 'exchange_rate_instructions' => 'Das Girokonto "@name" akzeptiert nur Transaktionen in @native_currency. Wenn Sie stattdessen @foreign_currency verwenden wollen, sollten Sie sicherstellen, dass der Betrag auch in @native_currency angegeben ist:', 'transfer_exchange_rate_instructions' => 'Das Quellkonto "@source_name" akzeptiert nur Transaktionen in @source_currency. Das Zielkonto "@dest_name" akzeptiert nur Transaktionen in @dest_currency. Sie müssen den Betrag in beiden Währungen korrekt angeben.', 'transaction_data' => 'Transaktionsdaten', - 'invalid_server_configuration' => 'Invalid server configuration', + 'invalid_server_configuration' => 'Ungültige Serverkonfiguration', 'invalid_locale_settings' => 'Firefly III is unable to format monetary amounts because your server is missing the required packages. There are instructions how to do this.', // search 'search' => 'Suche', - 'search_query' => 'Query', + 'search_query' => 'Abfrage', 'search_found_transactions' => 'Anzahl der gefundenen Transaktionen:', 'general_search_error' => 'Bei der Suche ist ein Fehler aufgetreten. Bitte überprüfen Sie die Protokolldateien für weitere Informationen.', 'search_box' => 'Suche', 'search_box_intro' => 'Willkommen zur Suchfunktion von Firefly III. Geben Sie Ihre Suchanfrage in das Feld ein. Stellen Sie sicher, dass Sie sich die Hilfedatei ansehen, da die Suche ziemlich fortgeschritten ist.', 'search_error' => 'Fehler beim Suchen', 'search_searching' => 'Suche ...', - 'search_results' => 'Search results', + 'search_results' => 'Suchergebnisse', // repeat frequencies: 'repeat_freq_yearly' => 'Jährlich', @@ -153,7 +153,7 @@ return [ // export data: 'import_and_export' => 'Import und Export', 'export_data' => 'Daten exportieren', - 'export_and_backup_data' => 'Export and backup', + 'export_and_backup_data' => 'Export und Sicherung', 'export_data_intro' => 'Zum Backup, zum Migrieren auf ein anderes System oder zum Migrieren in eine andere Firefly III Installation.', 'export_format' => 'Export-Format', 'export_format_csv' => 'Durch Komma getrennte Werte (CSV-Datei)', @@ -274,18 +274,18 @@ return [ 'rule_trigger_description_is_choice' => 'Beschreibung ist..', 'rule_trigger_description_is' => 'Beschreibung ist ":trigger_value"', 'rule_trigger_budget_is_choice' => 'Budget ist..', - 'rule_trigger_budget_is' => 'Budget is ":trigger_value"', + 'rule_trigger_budget_is' => 'Budget ist ":trigger_value"', 'rule_trigger_tag_is_choice' => '(A) Tag ist..', 'rule_trigger_tag_is' => 'A tag is ":trigger_value"', 'rule_trigger_has_attachments_choice' => 'Hat zumindest so viele Anhänge', 'rule_trigger_has_attachments' => 'Hat zumindest :trigger_value Anhäng(e)', 'rule_trigger_store_journal' => 'Wenn eine Transaktion erstellt wird', 'rule_trigger_update_journal' => 'Wenn eine Transaktion aktualisiert wird', - 'rule_trigger_has_no_category_choice' => 'Has no category', - 'rule_trigger_has_no_category' => 'Transaction has no category', + 'rule_trigger_has_no_category_choice' => 'ohne Kategorie', + 'rule_trigger_has_no_category' => 'Transaktion ohne Kategorie', 'rule_trigger_has_any_category_choice' => 'Has a (any) category', 'rule_trigger_has_any_category' => 'Transaction has a (any) category', - 'rule_trigger_has_no_budget_choice' => 'Has no budget', + 'rule_trigger_has_no_budget_choice' => 'Hat kein Budget', 'rule_trigger_has_no_budget' => 'Transaction has no budget', 'rule_trigger_has_any_budget_choice' => 'Has a (any) budget', 'rule_trigger_has_any_budget' => 'Transaction has a (any) budget', From 1f26b26a1650f9ee4fa71cc25aec15c37c1efb48 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 08:50:20 +0200 Subject: [PATCH 07/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index 5ebfac5a8e..e3497421b0 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -71,12 +71,12 @@ return [ 'piggy-banks_index_accountStatus' => 'For each asset account with at least one piggy bank the status is listed in this table.', // create piggy - 'piggy-banks_create_name' => 'What is your goal? A new couch, a camera, money for emergencies?', - 'piggy-banks_create_date' => 'You can set a target date or a deadline for your piggy bank.', + 'piggy-banks_create_name' => 'Was ist Ihr Ziel? Eine neue Couch, eine Kamera, Geld für Notfälle?', + 'piggy-banks_create_date' => 'Sie können ein Zieldatum oder einen Termin für Ihr Sparschwein festlegen.', // show piggy - 'piggy-banks_show_piggyChart' => 'This chart will show the history of this piggy bank.', - 'piggy-banks_show_piggyDetails' => 'Some details about your piggy bank', + 'piggy-banks_show_piggyChart' => 'Diese Grafik zeigt die Historie dieses Sparschweins.', + 'piggy-banks_show_piggyDetails' => 'Einige Details über Ihr Sparschwein', 'piggy-banks_show_piggyEvents' => 'Any additions or removals are also listed here.', // bill index From 6b82679f78c677b5575d8733d6cb9e22e257540d Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 10:00:36 +0200 Subject: [PATCH 08/49] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index a22b8b5167..3c8c44ff80 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -971,9 +971,9 @@ return [ 'this_deposit' => 'Ce dépôt', 'this_transfer' => 'Ce transfert', 'overview_for_link' => 'Aperçu pour le type de lien ":name"', - 'source_transaction' => 'Source transaction', - 'link_description' => 'Link description', - 'destination_transaction' => 'Destination transaction', + 'source_transaction' => 'Source de la transaction', + 'link_description' => 'Description du lien', + 'destination_transaction' => 'Destination de la transaction', 'delete_journal_link' => 'Supprimez le lien entre :source et :destination', 'deleted_link' => 'Lien supprimé', From dce39066ad4aafe5aa4a3e6900409036e8f357b9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 10:11:01 +0200 Subject: [PATCH 09/49] New translations breadcrumbs.php (French) --- resources/lang/fr_FR/breadcrumbs.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php index b94f581512..f807e4aedb 100644 --- a/resources/lang/fr_FR/breadcrumbs.php +++ b/resources/lang/fr_FR/breadcrumbs.php @@ -33,12 +33,12 @@ return [ 'transfers_list' => 'Virements', 'create_withdrawal' => 'Créer un nouveau retrait', 'create_deposit' => 'Créer un nouveau versement', - 'create_transfer' => 'Creer un nouveau virement', + 'create_transfer' => 'Créer un nouveau virement', 'edit_journal' => 'Éditer la transaction ":description"', 'delete_journal' => 'Supprimer la transaction ":description"', 'tags' => 'Mots-clés', - 'createTag' => 'Créer un nouveau tag', - 'edit_tag' => 'Éditer le tag ":tag"', - 'delete_tag' => 'Supprimer le tag ":tag"', + 'createTag' => 'Créer un nouveau mot-clé', + 'edit_tag' => 'Éditer le mot-clé ":tag"', + 'delete_tag' => 'Supprimer le mot-clé ":tag"', 'delete_journal_link' => 'Supprimer le lien entre les transactions', ]; From 84b20f3f3214ec0c23ac525cabfe06ce9e61bb28 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 10:11:02 +0200 Subject: [PATCH 10/49] New translations csv.php (French) --- resources/lang/fr_FR/csv.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 2c5ef5b3e6..da21e29c72 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -76,8 +76,8 @@ return [ 'column_sepa-ct-id' => 'SEPA Transfert Crédit ID de bout en bout', 'column_sepa-ct-op' => 'SEPA Transfert Crédit compte opposé', 'column_sepa-db' => 'SEPA débit immédiat', - 'column_tags-comma' => 'Tags (séparé par des virgules)', - 'column_tags-space' => 'Tags (séparé par des espaces)', + 'column_tags-comma' => 'Mots-clés (séparé par des virgules)', + 'column_tags-space' => 'Mots-clés (séparé par des espaces)', 'column_account-number' => 'Compte d’actif (numéro de compte)', 'column_opposing-number' => 'Compte destination (numéro de compte)', ]; From dea2b055ae7b053f59e884151d5b5f926dff6e5c Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 10:11:05 +0200 Subject: [PATCH 11/49] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 3c8c44ff80..524cec7370 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -21,7 +21,7 @@ return [ 'everything' => 'Tout', 'customRange' => 'Etendue personnalisée', 'apply' => 'Appliquer', - 'select_date' => 'Sélectionnez la date..', + 'select_date' => 'Sélectionner une date..', 'cancel' => 'Annuler', 'from' => 'Depuis', 'to' => 'A', @@ -30,24 +30,24 @@ return [ 'no_results_for_empty_search' => 'Votre recherche était vide, rien n’a été trouvé.', 'removed_amount' => 'Supprimé :amount', 'added_amount' => 'Ajouté :amount', - 'asset_account_role_help' => 'Toutes options supplémentaires résultant de votre choix peut être réglée plus tard.', + 'asset_account_role_help' => 'Toutes options supplémentaires résultant de votre choix peuvent être réglées plus tard.', 'Opening balance' => 'Solde initial', 'create_new_stuff' => 'Créer de nouvelles choses', 'new_withdrawal' => 'Nouveau retrait', 'new_deposit' => 'Nouveau dépôt', - 'new_transfer' => 'Nouveau transfert', + 'new_transfer' => 'Nouveau virement', 'new_asset_account' => 'Nouveau compte d’actif', 'new_expense_account' => 'Nouveau compte de dépenses', 'new_revenue_account' => 'Nouveau compte de recettes', 'new_budget' => 'Nouveau budget', 'new_bill' => 'Nouvelle facture', - 'block_account_logout' => 'Vous avez été déconnecté. Les comptes bloqués ne peuvent pas utiliser ce site. Vous êtes vous enregistrés avec une adresse email valide ?', + 'block_account_logout' => 'Vous avez été déconnecté. Les comptes bloqués ne peuvent pas utiliser ce site. Vous êtes vous enregistrés avec une adresse e-mail valide ?', 'flash_success' => 'Terminé avec succès !', 'flash_info' => 'Message', 'flash_warning' => 'Attention !', 'flash_error' => 'Erreur !', 'flash_info_multiple' => 'Il y a un message| Il y a :count messages', - 'flash_error_multiple' => 'Il y a une erreur|Il y a :count errors', + 'flash_error_multiple' => 'Il y a une erreur|Il y a :count erreurs', 'net_worth' => 'Valeur nette', 'route_has_no_help' => 'Il n\'y a pas d\'aide pour cette page.', 'two_factor_welcome' => 'Bonjour, :user !', @@ -836,7 +836,7 @@ return [ 'left_to_spend' => 'Restant à dépenser', 'earned' => 'Gagné', 'overspent' => 'Trop dépensé', - 'left' => 'Gauche', + 'left' => 'Restant', 'no_budget' => '(pas de budget)', 'max-amount' => 'Montant maximum', 'min-amount' => 'Montant minimum', From 3fa5f1cff655e5e713f6d60847630b8cf68290c4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 10:20:31 +0200 Subject: [PATCH 12/49] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 524cec7370..678bd21ab1 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -728,7 +728,7 @@ return [ 'no' => 'Non', 'amount' => 'Montant', 'overview' => 'Vue globale', - 'saveOnAccount' => 'Sauvegarder le compte', + 'saveOnAccount' => 'Mis de côté sur le compte', 'unknown' => 'Inconnu', 'daily' => 'Journalier', 'monthly' => 'Mensuel', @@ -862,8 +862,8 @@ return [ 'account_status' => 'Statut du compte', 'left_for_piggy_banks' => 'Reste pour les tirelires', 'sum_of_piggy_banks' => 'Somme des tirelires', - 'saved_so_far' => 'Enregistré jusqu\'à présent', - 'left_to_save' => 'Reste à sauver', + 'saved_so_far' => 'Mis de côté jusqu\'à présent', + 'left_to_save' => 'Reste à mettre de côté', 'suggested_amount' => 'Montant mensuel suggéré à enregistrer', 'add_money_to_piggy_title' => 'Ajouter de l’argent à la tirelire ":name"', 'remove_money_from_piggy_title' => 'Retirer l’argent de la tirelire ":name"', From b9679284d026d4cc8e93a8082054092954d32e48 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 10:20:32 +0200 Subject: [PATCH 13/49] New translations intro.php (French) --- resources/lang/fr_FR/intro.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php index 968045f74b..be721ae9cc 100644 --- a/resources/lang/fr_FR/intro.php +++ b/resources/lang/fr_FR/intro.php @@ -66,7 +66,7 @@ return [ 'transactions_create_transfer_ffInput_piggy_bank_id' => 'Sélectionnez une tirelire et reliez ce transfert à vos économies.', // piggy banks index: - 'piggy-banks_index_saved' => 'Ce champ vous montre combien vous avez enregistré dans chaque tirelire.', + 'piggy-banks_index_saved' => 'Ce champ vous montre combien vous avez mis de côté dans chaque tirelire.', 'piggy-banks_index_button' => 'À côté de cette barre de progression sont deux boutons (+ et -) pour ajouter ou retirer de l’argent de chaque tirelire.', 'piggy-banks_index_accountStatus' => 'Pour chaque compte d\'actif avec au moins une tirelire, le statut est indiqué dans ce tableau.', From b754c9d8a36781adf12664b40d2450b4d3e4eb4c Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 14:00:41 +0200 Subject: [PATCH 14/49] New translations breadcrumbs.php (Slovenian) --- resources/lang/sl_SI/breadcrumbs.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/sl_SI/breadcrumbs.php b/resources/lang/sl_SI/breadcrumbs.php index 9315ce140c..04b738b939 100644 --- a/resources/lang/sl_SI/breadcrumbs.php +++ b/resources/lang/sl_SI/breadcrumbs.php @@ -26,7 +26,7 @@ return [ 'edit_bill' => 'uredi trajnik ":name"', 'delete_bill' => 'izbriši trajnik ":name"', 'reports' => 'Poročila', - 'search_result' => 'Search results for ":query"', + 'search_result' => 'rezultati iskanja za ":query"', 'withdrawal_list' => 'stroški', 'deposit_list' => 'prihodki', 'transfer_list' => 'prenosi', @@ -40,5 +40,5 @@ return [ 'createTag' => 'ustvari novo značko', 'edit_tag' => 'uredi značko ":tag"', 'delete_tag' => 'izbriši značko ":tag"', - 'delete_journal_link' => 'Delete link between transactions', + 'delete_journal_link' => 'Izbriši povezavo med transakcijami', ]; From d9e8036dda7b4136d5b406f679990d944081101b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 14:00:43 +0200 Subject: [PATCH 15/49] New translations list.php (Slovenian) --- resources/lang/sl_SI/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php index f4cae8b284..0bdb7e211f 100644 --- a/resources/lang/sl_SI/list.php +++ b/resources/lang/sl_SI/list.php @@ -17,7 +17,7 @@ return [ 'id' => 'ID', 'create_date' => 'Ustvarjeno', 'update_date' => 'Posodobljeno', - 'updated_at' => 'Updated at', + 'updated_at' => 'Posodobljeno', 'balance_before' => 'Stanje prej', 'balance_after' => 'Stanje potem', 'name' => 'ime', From 1bb3581fef0a4ae5a33a786bf32c3f735607f317 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 14:00:44 +0200 Subject: [PATCH 16/49] New translations bank.php (Slovenian) --- resources/lang/sl_SI/bank.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/sl_SI/bank.php b/resources/lang/sl_SI/bank.php index 11f05b3785..964f43f024 100644 --- a/resources/lang/sl_SI/bank.php +++ b/resources/lang/sl_SI/bank.php @@ -1,6 +1,6 @@ 'Prerequisites for an import from bunq', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app.', + 'bunq_prerequisites_title' => 'Predpogoji za uvoz iz bunq', + 'bunq_prerequisites_text' => 'Če želite uvoziti iz bunq-a, morate pridobiti ključ za API. To lahko storite s pomočjo aplikacije.', ]; \ No newline at end of file From 6c5f9157514624c6c53c77ffd355e904329df7f6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 16:50:10 +0200 Subject: [PATCH 17/49] New translations csv.php (Slovenian) --- resources/lang/sl_SI/csv.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php index aa1b9f0ddb..eaa356c8af 100644 --- a/resources/lang/sl_SI/csv.php +++ b/resources/lang/sl_SI/csv.php @@ -14,10 +14,10 @@ declare(strict_types=1); return [ // initial config - 'initial_title' => 'Import setup (1/3) - Basic CSV import setup', - 'initial_text' => 'To be able to import your file correctly, please validate the options below.', - 'initial_box' => 'Basic CSV import setup', - 'initial_box_title' => 'Basic CSV import setup options', + 'initial_title' => 'Nastavitve uvoza (1/3) - Osnovne nastavitve', + 'initial_text' => 'Če želite pravilno uvoziti svojo datoteko, preverite spodnje nastavitve.', + 'initial_box' => 'Osnovne nastavitve uvoza CSV', + 'initial_box_title' => 'Osnovne nastavitve uvoza CSV', 'initial_header_help' => 'Check this box if the first row of your CSV file are the column titles.', 'initial_date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.', 'initial_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', From a3b8cb25ca106923fc8ff23ac662b15cea76a271 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 16:50:12 +0200 Subject: [PATCH 18/49] New translations list.php (Slovenian) --- resources/lang/sl_SI/list.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/lang/sl_SI/list.php b/resources/lang/sl_SI/list.php index 0bdb7e211f..6aa58450e2 100644 --- a/resources/lang/sl_SI/list.php +++ b/resources/lang/sl_SI/list.php @@ -80,13 +80,13 @@ return [ 'budget_count' => 'Število budžetov', 'rule_and_groups_count' => 'Število pravil in skupin pravil', 'tags_count' => 'Število značk', - 'inward' => 'Inward description', - 'outward' => 'Outward description', - 'number_of_transactions' => 'Number of transactions', - 'total_amount' => 'Total amount', - 'sum' => 'Sum', - 'sum_excluding_transfers' => 'Sum (excluding transfers)', - 'sum_withdrawals' => 'Sum of withdrawals', - 'sum_deposits' => 'Sum of deposits', - 'sum_transfers' => 'Sum of transfers', + 'inward' => 'Interni opis', + 'outward' => 'Eksterni opis', + 'number_of_transactions' => 'Število transakcij', + 'total_amount' => 'Skupni znesek', + 'sum' => 'Vsota', + 'sum_excluding_transfers' => 'Vsota (brez prenosov)', + 'sum_withdrawals' => 'Vsota odlivov', + 'sum_deposits' => 'Vsota prilivov', + 'sum_transfers' => 'Vsota prenosov', ]; From d161c9850a0d2899c2807c98eaf40e7cbbcd871f Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 17:00:07 +0200 Subject: [PATCH 19/49] New translations csv.php (Slovenian) --- resources/lang/sl_SI/csv.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php index eaa356c8af..ac8f46d39c 100644 --- a/resources/lang/sl_SI/csv.php +++ b/resources/lang/sl_SI/csv.php @@ -18,23 +18,23 @@ return [ 'initial_text' => 'Če želite pravilno uvoziti svojo datoteko, preverite spodnje nastavitve.', 'initial_box' => 'Osnovne nastavitve uvoza CSV', 'initial_box_title' => 'Osnovne nastavitve uvoza CSV', - 'initial_header_help' => 'Check this box if the first row of your CSV file are the column titles.', - 'initial_date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.', - 'initial_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', - 'initial_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.', - 'initial_submit' => 'Continue with step 2/3', + 'initial_header_help' => 'Obkljukajte ta okvirček, če prva vrstica v CSV datoteki vsebuje naslove stolpcev.', + 'initial_date_help' => 'Formatiranje datuma in časa v vaši CSV datoteki. Uporabite obliko zapisa kot je navedena na tej strani. Privzeta vrednost bo prepoznala datume, ki so videti takole:: dateExample.', + 'initial_delimiter_help' => 'Izberi ločilo, ki je uporabljeno za ločevanje med posameznimi stolpci v vaši datoteki. Če niste prepričani, je vejica najbolj pogosta izbira.', + 'initial_import_account_help' => 'Če vaša CSV datoteka ne vsebuje informacij o vaših premoženjskih računih, uporabite ta seznam, da izberete kateremu računu pripadajo transakcije v CSV datoteki.', + 'initial_submit' => 'Nadaljujte s korakom 2/3', // roles config - 'roles_title' => 'Import setup (2/3) - Define each column\'s role', - 'roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', - 'roles_table' => 'Table', - 'roles_column_name' => 'Name of column', - 'roles_column_example' => 'Column example data', - 'roles_column_role' => 'Column data meaning', - 'roles_do_map_value' => 'Map these values', - 'roles_column' => 'Column', - 'roles_no_example_data' => 'No example data available', - 'roles_submit' => 'Continue with step 3/3', + 'roles_title' => 'Nastavitve uvoza (1/3) - Določite vlogo vsakega stolpca', + 'roles_text' => 'Vsak stolpec v vaši datoteki CSV vsebuje določene podatke. Določite, kateri podatki se pričakujejo v katerih stolpcih. Možnost »mapiranja« podatkov pomeni, da boste vsak vnos, ki ste ga našli v stolpcu, povezal z vrednostjo v svoji bazi podatkov. Često izbran je stolpec, ki vsebuje IBAN protiračuna. Tako je mogoče transackijo enostavno povezati s protiračunom v vaši bazi podatkov.', + 'roles_table' => 'Tabela', + 'roles_column_name' => 'Ime stolpca', + 'roles_column_example' => 'primeri podatkov v stolpcu', + 'roles_column_role' => 'pomen podatkov v stolpcu', + 'roles_do_map_value' => 'poveži te vrednosti', + 'roles_column' => 'Stolpec', + 'roles_no_example_data' => 'primerov podatkov ni na voljo', + 'roles_submit' => 'Nadaljujte s korakom 2/3', 'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', // map data From c31160f82decc0ee1efb4de065c2208d3b0654e4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 17:10:08 +0200 Subject: [PATCH 20/49] New translations csv.php (Slovenian) --- resources/lang/sl_SI/csv.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/lang/sl_SI/csv.php b/resources/lang/sl_SI/csv.php index ac8f46d39c..216c4886ae 100644 --- a/resources/lang/sl_SI/csv.php +++ b/resources/lang/sl_SI/csv.php @@ -35,15 +35,15 @@ return [ 'roles_column' => 'Stolpec', 'roles_no_example_data' => 'primerov podatkov ni na voljo', 'roles_submit' => 'Nadaljujte s korakom 2/3', - 'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'roles_warning' => 'Čisto na koncu določite stolpec z zneskom. Priporočljivo je da izberete tudi stolpce z opisom, datumom in protiračunom.', // map data - 'map_title' => 'Import setup (3/3) - Connect import data to Firefly III data', + 'map_title' => 'Uvozna nastavitev (3/3) - Povežite uvozne podatke s podatki v Firefly III', 'map_text' => 'Vrednosti na levi v spodnji tabeli prikazujejo podatke iz naložene CSV datoteke. Vaša naloga je, da jim, če je možno, določite obtoječio vrednost iz podatkovne baze. Firefly bo to upošteval pri uvozu. Če v podatkovni bazi ni ustrezne vrednosti, ali vrednosti ne želite določiti ničesar, potem pustite prazno.', - 'map_field_value' => 'Field value', - 'map_field_mapped_to' => 'Mapped to', - 'map_do_not_map' => '(do not map)', - 'map_submit' => 'Start the import', + 'map_field_value' => 'podatek', + 'map_field_mapped_to' => 'povezan z', + 'map_do_not_map' => '(ne poveži)', + 'map_submit' => 'Začnite uvoz', // map things. 'column__ignore' => '(ignoriraj ta stolpec)', From ade8bbb22195da75eb6afb7843657ff3102ce23b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 17:10:10 +0200 Subject: [PATCH 21/49] New translations firefly.php (Slovenian) --- resources/lang/sl_SI/firefly.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php index 42f7abf3cb..9aaee558c5 100644 --- a/resources/lang/sl_SI/firefly.php +++ b/resources/lang/sl_SI/firefly.php @@ -14,26 +14,26 @@ declare(strict_types=1); return [ // general stuff: 'close' => 'zapri', - 'actions' => 'Actions', + 'actions' => 'Dejanja', 'edit' => 'uredi', 'delete' => 'izbriši', 'welcomeBack' => 'Kaj dogaja?', 'everything' => 'vse', 'customRange' => 'obseg po meri', 'apply' => 'uporabi', - 'select_date' => 'Select date..', + 'select_date' => 'Izberi datum..', 'cancel' => 'prekliči', - 'from' => 'From', - 'to' => 'To', + 'from' => 'Od', + 'to' => 'Do', 'showEverything' => 'pokaži vse', 'never' => 'nikoli', - 'no_results_for_empty_search' => 'Your search was empty, so nothing was found.', - 'removed_amount' => 'Removed :amount', - 'added_amount' => 'Added :amount', + 'no_results_for_empty_search' => 'Vaše iskanje je bilo prazno, zato ni bilo mogoče najti ničesar.', + 'removed_amount' => 'Odstranjeno: znesek', + 'added_amount' => 'Dodano: znesek', 'asset_account_role_help' => 'Dodatne možnosti se lahko nastavljajo tudi kasneje.', - 'Opening balance' => 'Opening balance', - 'create_new_stuff' => 'Create new stuff', - 'new_withdrawal' => 'New withdrawal', + 'Opening balance' => 'Začetno stanje', + 'create_new_stuff' => 'Ustvari novo kramo', + 'new_withdrawal' => 'Nov odliv', 'new_deposit' => 'nov depozit', 'new_transfer' => 'nov prenos', 'new_asset_account' => 'nov premoženjski račun', @@ -41,12 +41,12 @@ return [ 'new_revenue_account' => 'nov konto za dohodke', 'new_budget' => 'nov budžet', 'new_bill' => 'nov trajnik', - 'block_account_logout' => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?', - 'flash_success' => 'Success!', - 'flash_info' => 'Message', - 'flash_warning' => 'Warning!', - 'flash_error' => 'Error!', - 'flash_info_multiple' => 'There is one message|There are :count messages', + 'block_account_logout' => 'Odjavljeni ste. Blokirani računi ne morejo uporabljati te spletne strani. Ali ste se registrirali z veljavnim e-poštnim naslovom?', + 'flash_success' => 'Uspelo je!', + 'flash_info' => 'Sporočilo', + 'flash_warning' => 'Opozorilo!', + 'flash_error' => 'Napaka!', + 'flash_info_multiple' => 'Tukajle je eno sporočilo | Tukajle je :count sporočil', 'flash_error_multiple' => 'There is one error|There are :count errors', 'net_worth' => 'Net worth', 'route_has_no_help' => 'There is no help for this route.', From 1753b58ec920a9be7e76e563afd134a07bed0ac8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 17:20:14 +0200 Subject: [PATCH 22/49] New translations firefly.php (Slovenian) --- resources/lang/sl_SI/firefly.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php index 9aaee558c5..f33b2445b2 100644 --- a/resources/lang/sl_SI/firefly.php +++ b/resources/lang/sl_SI/firefly.php @@ -47,22 +47,22 @@ return [ 'flash_warning' => 'Opozorilo!', 'flash_error' => 'Napaka!', 'flash_info_multiple' => 'Tukajle je eno sporočilo | Tukajle je :count sporočil', - 'flash_error_multiple' => 'There is one error|There are :count errors', - 'net_worth' => 'Net worth', - 'route_has_no_help' => 'There is no help for this route.', - 'two_factor_welcome' => 'Hello, :user!', - 'two_factor_enter_code' => 'To continue, please enter your two factor authentication code. Your application can generate it for you.', - 'two_factor_code_here' => 'Enter code here', - 'two_factor_title' => 'Two factor authentication', - 'authenticate' => 'Authenticate', + 'flash_error_multiple' => 'Tukajle je ena napaka | Tukajle je :count napak', + 'net_worth' => 'Neto vrednost', + 'route_has_no_help' => 'Tukaj vam žal ni pomoči.', + 'two_factor_welcome' => 'Zdravo, :user!', + 'two_factor_enter_code' => 'Če želite nadaljevati, vnesite svojo kodo. Vaš program za prijavo jo lahko ustvari za vas.', + 'two_factor_code_here' => 'Vnesite kodo tukaj', + 'two_factor_title' => 'Overovitev v dveh korakih', + 'authenticate' => 'Identifikacija', 'two_factor_forgot_title' => 'Lost two factor authentication', - 'two_factor_forgot' => 'I forgot my two-factor thing.', + 'two_factor_forgot' => 'Pozabil sem svojo reč za dva koraka.', 'two_factor_lost_header' => 'Lost your two factor authentication?', - 'two_factor_lost_intro' => 'Unfortunately, this is not something you can reset from the web interface. You have two choices.', - 'two_factor_lost_fix_self' => 'If you run your own instance of Firefly III, check the logs in storage/logs for instructions.', - 'two_factor_lost_fix_owner' => 'Otherwise, email the site owner, :site_owner and ask them to reset your two factor authentication.', - 'warning_much_data' => ':days days of data may take a while to load.', - 'registered' => 'You have registered successfully!', + 'two_factor_lost_intro' => 'Na žalost, to ni nekaj, kar lahko ponastavite iz spletnega vmesnika. Imate dve možnosti.', + 'two_factor_lost_fix_self' => 'Če uporabljate svoj lastni Firefly III, za navodila preglejte dnevnike v storage/logs.', + 'two_factor_lost_fix_owner' => 'V nasprotnem primeru pišite po e-pošti lastniku spletnega mesta : site_owner in ga prosite, da ponastavijo vaše preverjanje pristnosti v dveh korakih.', + 'warning_much_data' => ':days dni podatkov se lahko nalaga kar nekaj časa.', + 'registered' => 'Uspešno ste se registrirali!', 'Default asset account' => 'privzeti premoženjski račun', 'no_budget_pointer' => 'Kot kaže niste definirali še nobenega budžeta. Budžete lahko ustvarite na strani budžeti>. Budžeti vam pomagajo držati pregled nad vašimi stroški.', 'Savings account' => 'Savings account', From 31b92fe5947cca5d582169aa5a95fd7402c1a1b8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 Oct 2017 17:32:09 +0200 Subject: [PATCH 23/49] New translations firefly.php (Slovenian) --- resources/lang/sl_SI/firefly.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/sl_SI/firefly.php b/resources/lang/sl_SI/firefly.php index f33b2445b2..8987412777 100644 --- a/resources/lang/sl_SI/firefly.php +++ b/resources/lang/sl_SI/firefly.php @@ -65,13 +65,13 @@ return [ 'registered' => 'Uspešno ste se registrirali!', 'Default asset account' => 'privzeti premoženjski račun', 'no_budget_pointer' => 'Kot kaže niste definirali še nobenega budžeta. Budžete lahko ustvarite na strani budžeti>. Budžeti vam pomagajo držati pregled nad vašimi stroški.', - 'Savings account' => 'Savings account', - 'Credit card' => 'Credit card', - 'source_accounts' => 'Source account(s)', - 'destination_accounts' => 'Destination account(s)', - 'user_id_is' => 'Your user id is :user', - 'field_supports_markdown' => 'This field supports Markdown.', - 'need_more_help' => 'If you need more help using Firefly III, please open a ticket on Github.', + 'Savings account' => 'Varčevalni račun', + 'Credit card' => 'kreditna kartica', + 'source_accounts' => 'Izvorni račun', + 'destination_accounts' => 'Ciljni račun', + 'user_id_is' => 'Vaše uporabniško ime se glasi : user', + 'field_supports_markdown' => 'To polje podpira Markdown.', + 'need_more_help' => 'Če potrebujete več pomoči pri uporabi Firefly III, prosimo, da odprete zahtevek za pomoč na Githubu.', 'reenable_intro_text' => 'You can also reenable the introduction guidance.', 'intro_boxes_after_refresh' => 'The introduction boxes will reappear when you refresh the page.', 'show_all_no_filter' => 'Show all transactions without grouping them by date.', From bea0c8dd55cf96568679bbcf76fe7ff7f8ba4b21 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 08:16:57 +0200 Subject: [PATCH 24/49] Update docker files. #919 and #915 --- Dockerfile | 5 +---- docker/entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b2862ac32..088c2d50d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,10 +46,7 @@ COPY . $FIREFLY_PATH RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage -RUN composer install --prefer-dist --no-dev --no-scripts -RUN composer dump-autoload -RUN php artisan firefly:instructions install -RUN php artisan optimize +RUN composer install --prefer-dist --no-dev --no-scripts && cat .env.docker | envsubst > .env && composer dump-autoload && php artisan firefly:instructions install && php artisan optimize EXPOSE 80 diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2d7d479bfb..933e3c1536 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/bash -cat .env.docker | envsubst > .env +# cat .env.docker | envsubst > .env exec apache2-foreground From dadeb4616e683d1aa031c64a9fc0291a679485b9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 09:14:34 +0200 Subject: [PATCH 25/49] Updated docker file. --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 088c2d50d9..4f4d677b34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,12 @@ COPY . $FIREFLY_PATH RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage -RUN composer install --prefer-dist --no-dev --no-scripts && cat .env.docker | envsubst > .env && composer dump-autoload && php artisan firefly:instructions install && php artisan optimize +RUN cat .env.docker | envsubst > .env +RUN composer install --prefer-dist --no-dev +RUN composer dump-autoload +RUN php artisan optimize +RUN php artisan package:discover +RUN php artisan firefly:instructions install EXPOSE 80 From 011e28e8c254e7cfac9afd27d409e529c29b4d49 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 09:34:03 +0200 Subject: [PATCH 26/49] Updated docker file. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4f4d677b34..358babe19c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ COPY . $FIREFLY_PATH RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage -RUN cat .env.docker | envsubst > .env +RUN cat .env.docker | envsubst > .env && cat .env RUN composer install --prefer-dist --no-dev RUN composer dump-autoload RUN php artisan optimize From 27d533dd5bd292a7c1070872759d0d91fd132edb Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 10:07:09 +0200 Subject: [PATCH 27/49] New docker things. --- Dockerfile | 7 +------ docker-compose.yml | 1 + docker/entrypoint.sh | 6 +++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 358babe19c..a77bb0928c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,12 +46,7 @@ COPY . $FIREFLY_PATH RUN chown -R www-data:www-data /var/www && chmod -R 775 $FIREFLY_PATH/storage -RUN cat .env.docker | envsubst > .env && cat .env -RUN composer install --prefer-dist --no-dev -RUN composer dump-autoload -RUN php artisan optimize -RUN php artisan package:discover -RUN php artisan firefly:instructions install +RUN composer install --prefer-dist --no-dev --no-scripts EXPOSE 80 diff --git a/docker-compose.yml b/docker-compose.yml index 92f79e2ea6..8bcdf06244 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: - FF_DB_USER=firefly_db - FF_DB_PASSWORD=firefly_db_secret - FF_APP_KEY=SomeRandomStringOf32CharsExactly + - FF_APP_ENV=production ports: - "80:80" links: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 933e3c1536..5f6409bf3b 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -1,5 +1,9 @@ #!/bin/bash -# cat .env.docker | envsubst > .env +cat .env.docker | envsubst > .env && cat .env +composer dump-autoload +php artisan optimize +php artisan package:discover +php artisan firefly:instructions install exec apache2-foreground From 668e36ccf69a57aab42e3473db965dc6c5ef148c Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 14:00:17 +0200 Subject: [PATCH 28/49] New translations list.php (German) --- resources/lang/de_DE/list.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index 017235103d..118d36becd 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -17,7 +17,7 @@ return [ 'id' => 'Id', 'create_date' => 'Erstellt am', 'update_date' => 'Aktualisiert am', - 'updated_at' => 'Updated at', + 'updated_at' => 'Aktualisiert am', 'balance_before' => 'Bilanz vor', 'balance_after' => 'Bilanz nach', 'name' => 'Name', @@ -83,10 +83,10 @@ return [ 'inward' => 'Inward description', 'outward' => 'Outward description', 'number_of_transactions' => 'Anzahl der Zahlungsvorgänge', - 'total_amount' => 'Total amount', - 'sum' => 'Sum', - 'sum_excluding_transfers' => 'Sum (excluding transfers)', - 'sum_withdrawals' => 'Sum of withdrawals', - 'sum_deposits' => 'Sum of deposits', - 'sum_transfers' => 'Sum of transfers', + 'total_amount' => 'Gesamtbetrag', + 'sum' => 'Summe', + 'sum_excluding_transfers' => 'Summe (ohne Überweisungen)', + 'sum_withdrawals' => 'Summe der Auszahlungen', + 'sum_deposits' => 'Summe der Einzahlungen', + 'sum_transfers' => 'Summe der Überweisungen', ]; From ece042b468e8c54128c2cab0aa53d3398b7965b2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 14:00:18 +0200 Subject: [PATCH 29/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index e3497421b0..f8b5d56b8d 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -77,10 +77,10 @@ return [ // show piggy 'piggy-banks_show_piggyChart' => 'Diese Grafik zeigt die Historie dieses Sparschweins.', 'piggy-banks_show_piggyDetails' => 'Einige Details über Ihr Sparschwein', - 'piggy-banks_show_piggyEvents' => 'Any additions or removals are also listed here.', + 'piggy-banks_show_piggyEvents' => 'Hinzufügungen oder Entfernungen sind hier ebenfalls aufgeführt.', // bill index - 'bills_index_paid_in_period' => 'This field indicates when the bill was last paid.', + 'bills_index_paid_in_period' => 'Dieses Feld zeigt an, wann die Rechnung zuletzt bezahlt wurde.', 'bills_index_expected_in_period' => 'This field indicates for each bill if and when the next bill is expected to hit.', // show bill From beabed1c1b39bf17c842b18c626bfbad0a26a452 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 14:10:11 +0200 Subject: [PATCH 30/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index f8b5d56b8d..8c2dc2fd97 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -81,42 +81,42 @@ return [ // bill index 'bills_index_paid_in_period' => 'Dieses Feld zeigt an, wann die Rechnung zuletzt bezahlt wurde.', - 'bills_index_expected_in_period' => 'This field indicates for each bill if and when the next bill is expected to hit.', + 'bills_index_expected_in_period' => 'Dieses Feld zeigt für jede Rechnung an, ob und wann die nächste Rechnung erwartet wird.', // show bill - 'bills_show_billInfo' => 'This table shows some general information about this bill.', - 'bills_show_billButtons' => 'Use this button to re-scan old transactions so they will be matched to this bill.', - 'bills_show_billChart' => 'This chart shows the transactions linked to this bill.', + 'bills_show_billInfo' => 'Diese Tabelle enthält allgemeine Informationen über diese Rechnung.', + 'bills_show_billButtons' => 'Verwenden Sie diese Schaltfläche, um alte Transaktionen erneut zu scannen, sodass sie mit dieser Rechnung verglichen werden.', + 'bills_show_billChart' => 'Diese Grafik zeigt die mit dieser Rechnung verknüpften Transaktionen.', // create bill - 'bills_create_name' => 'Use a descriptive name such as "Rent" or "Health insurance".', + 'bills_create_name' => 'Verwenden Sie einen aussagekräftigen Namen wie "Miete" oder "Krankenversicherung".', 'bills_create_match' => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.', - 'bills_create_amount_min_holder' => 'Select a minimum and maximum amount for this bill.', + 'bills_create_amount_min_holder' => 'Wählen Sie einen Mindest- und Höchstbetrag für diese Rechnung aus.', 'bills_create_repeat_freq_holder' => 'Most bills repeat monthly, but you can set another frequency here.', 'bills_create_skip_holder' => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.', // rules index 'rules_index_intro' => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.', 'rules_index_new_rule_group' => 'You can combine rules in groups for easier management.', - 'rules_index_new_rule' => 'Create as many rules as you like.', - 'rules_index_prio_buttons' => 'Order them any way you see fit.', - 'rules_index_test_buttons' => 'You can test your rules or apply them to existing transactions.', - 'rules_index_rule-triggers' => 'Rules have "triggers" and "actions" that you can order by drag-and-drop.', + 'rules_index_new_rule' => 'Erstellen Sie so viele Regeln, wie Sie möchten.', + 'rules_index_prio_buttons' => 'Sortieren Sie sie, wie Sie es für richtig halten.', + 'rules_index_test_buttons' => 'Sie können Ihre Regeln testen oder sie auf vorhandene Transaktionen anwenden.', + 'rules_index_rule-triggers' => 'Regeln haben "Auslöser" und "Aktionen", die Sie per Drag-and-Drop sortieren können.', 'rules_index_outro' => 'Be sure to check out the help pages using the (?) icon in the top right!', // create rule: 'rules_create_mandatory' => 'Choose a descriptive title, and set when the rule should be fired.', 'rules_create_ruletriggerholder' => 'Add as many triggers as you like, but remember that ALL triggers must match before any actions are fired.', 'rules_create_test_rule_triggers' => 'Use this button to see which transactions would match your rule.', - 'rules_create_actions' => 'Set as many actions as you like.', + 'rules_create_actions' => 'Legen Sie so viele Aktionen fest, wie Sie möchten.', // preferences - 'preferences_index_tabs' => 'More options are available behind these tabs.', + 'preferences_index_tabs' => 'Weitere Optionen sind hinter diesen Registerkarten verfügbar.', // currencies - 'currencies_index_intro' => 'Firefly III supports multiple currencies, which you can change on this page.', + 'currencies_index_intro' => 'Firefly III unterstützt mehrere Währungen, die Sie auf dieser Seite ändern können.', 'currencies_index_default' => 'Firefly III has one default currency. You can always switch of course using these buttons.', // create currency - 'currencies_create_code' => 'This code should be ISO compliant (Google it for your new currency).', + 'currencies_create_code' => 'Dieser Code sollte ISO-konform sein (Für eine neue Währung googlen).', ]; From 21701fd5f292e6af91fc594d59f1e96e931290cd Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 14:20:21 +0200 Subject: [PATCH 31/49] New translations intro.php (German) --- resources/lang/de_DE/intro.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index 8c2dc2fd97..7c470ca97f 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -68,7 +68,7 @@ return [ // piggy banks index: 'piggy-banks_index_saved' => 'Dieses Feld zeigt Ihnen, wie viel Sie in jedem Sparschwein gespart haben.', 'piggy-banks_index_button' => 'Neben diesem Fortschrittsbalken befinden sich zwei Buttons (+ und -), um Geld von jedem Sparschwein hinzuzufügen oder zu entfernen.', - 'piggy-banks_index_accountStatus' => 'For each asset account with at least one piggy bank the status is listed in this table.', + 'piggy-banks_index_accountStatus' => 'In dieser Tabelle wird der Status der Anlagenkonten aufgeführt, die mindestens mit einem Sparschwein verbunden sind.', // create piggy 'piggy-banks_create_name' => 'Was ist Ihr Ziel? Eine neue Couch, eine Kamera, Geld für Notfälle?', @@ -92,12 +92,12 @@ return [ 'bills_create_name' => 'Verwenden Sie einen aussagekräftigen Namen wie "Miete" oder "Krankenversicherung".', 'bills_create_match' => 'To match transactions, use terms from those transactions or the expense account involved. All words must match.', 'bills_create_amount_min_holder' => 'Wählen Sie einen Mindest- und Höchstbetrag für diese Rechnung aus.', - 'bills_create_repeat_freq_holder' => 'Most bills repeat monthly, but you can set another frequency here.', + 'bills_create_repeat_freq_holder' => 'Die meisten Rechnungen wiederholen sich monatlich, aber Sie können hier eine andere Frequenz einstellen.', 'bills_create_skip_holder' => 'If a bill repeats every 2 weeks for example, the "skip"-field should be set to "1" to skip every other week.', // rules index - 'rules_index_intro' => 'Firefly III allows you to manage rules, that will automagically be applied to any transaction you create or edit.', - 'rules_index_new_rule_group' => 'You can combine rules in groups for easier management.', + 'rules_index_intro' => 'Mit Firefly III können Sie Regeln verwalten, die automatisch auf alle Transaktionen angewendet werden, die Sie erstellen oder bearbeiten.', + 'rules_index_new_rule_group' => 'Sie können Regeln in Gruppen kombinieren, um die Verwaltung zu vereinfachen.', 'rules_index_new_rule' => 'Erstellen Sie so viele Regeln, wie Sie möchten.', 'rules_index_prio_buttons' => 'Sortieren Sie sie, wie Sie es für richtig halten.', 'rules_index_test_buttons' => 'Sie können Ihre Regeln testen oder sie auf vorhandene Transaktionen anwenden.', @@ -115,7 +115,7 @@ return [ // currencies 'currencies_index_intro' => 'Firefly III unterstützt mehrere Währungen, die Sie auf dieser Seite ändern können.', - 'currencies_index_default' => 'Firefly III has one default currency. You can always switch of course using these buttons.', + 'currencies_index_default' => 'Firefly III besitzt eine Standardwährung, die mit diesen Buttons gewechselt werden können.', // create currency 'currencies_create_code' => 'Dieser Code sollte ISO-konform sein (Für eine neue Währung googlen).', From 6dd0c2612b24ef15bb71b7ff2ae47235981d4272 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 14:31:30 +0200 Subject: [PATCH 32/49] New translations firefly.php (German) --- resources/lang/de_DE/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index c2717c7cb8..3a1f1f38a2 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -289,7 +289,7 @@ return [ 'rule_trigger_has_no_budget' => 'Transaction has no budget', 'rule_trigger_has_any_budget_choice' => 'Has a (any) budget', 'rule_trigger_has_any_budget' => 'Transaction has a (any) budget', - 'rule_trigger_has_no_tag_choice' => 'Has no tag(s)', + 'rule_trigger_has_no_tag_choice' => 'Hat keine(n) Tag(s)', 'rule_trigger_has_no_tag' => 'Transaction has no tag(s)', 'rule_trigger_has_any_tag_choice' => 'Has one or more (any) tags', 'rule_trigger_has_any_tag' => 'Transaction has one or more (any) tags', @@ -303,7 +303,7 @@ return [ 'rule_trigger_notes_contain' => 'Notes contain ":trigger_value"', 'rule_trigger_notes_start_choice' => 'Notes start with..', 'rule_trigger_notes_start' => 'Notes start with ":trigger_value"', - 'rule_trigger_notes_end_choice' => 'Notes end with..', + 'rule_trigger_notes_end_choice' => 'Notizen enden mit ..', 'rule_trigger_notes_end' => 'Notes end with ":trigger_value"', 'rule_action_set_category' => 'Kategorie zu ":action_value" festlegen', 'rule_action_clear_category' => 'Bereinige Kategorie', @@ -439,10 +439,10 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'secure_pw_sha1' => 'Aber ich dachte, dass SHA1 schon geknackt wurde?', 'secure_pw_hash_speed' => 'Yes, but not in this context. As you can read on the website detailing how they broke SHA1, it is now slightly easier to find a "collision": another string that results in the same SHA1-hash. It now only takes 10,000 years using a single-GPU machine.', 'secure_pw_hash_security' => 'This collision would not be equal to your password, nor would it be useful on (a site like) Firefly III. This application does not use SHA1 for password verification. So it is safe to check this box. Your password is hashed and sent over HTTPS.', - 'secure_pw_should' => 'Should I check the box?', + 'secure_pw_should' => 'Soll ich die Box ankreuzen?', 'secure_pw_long_password' => 'Wenn du gerade ein langes, Single-Use-Passwort für Firefly III mit einem Kennwortgenerator generiert hast: Nein.', 'secure_pw_short' => 'Wenn Sie gerade das Passwort eingegeben haben, welches Sie immer verwenden: Bitte ja.', - 'personal_access_token' => 'Personal access token', + 'personal_access_token' => 'Persönlicher Zugangs-Token', 'explain_access_token' => 'You need this token to perform command line options, such as importing or exporting data. Without it, such sensitive commands will not work. Do not share your access token. Nobody will ask you for this token, not even me. If you fear you lost this, or when you\'re paranoid, regenerate this token using the button.', 'regenerate_access_token' => 'Regenerate access token', 'token_regenerated' => 'A new token was generated', From 65f0acbd10bbecdd57b0e85efde6a8ae87fd3518 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 18:00:21 +0200 Subject: [PATCH 33/49] New translations csv.php (French) --- resources/lang/fr_FR/csv.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index da21e29c72..0d678882b7 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -67,8 +67,8 @@ return [ 'column_date-process' => 'Date de traitement de la transaction', 'column_date-transaction' => 'Date', 'column_description' => 'Description', - 'column_opposing-iban' => 'Compte destination(IBAN)', - 'column_opposing-id' => 'Compte destination(ID correspondant Firefly)', + 'column_opposing-iban' => 'Compte destination (IBAN)', + 'column_opposing-id' => 'ID du Compte destination(ID correspondant Firefly)', 'column_external-id' => 'Identifiant externe', 'column_opposing-name' => 'Compte destination (nom)', 'column_rabo-debet-credit' => 'Indicateur spécifique débit/crédit à Rabobank', From f63bf127337fb5cfc9903a680ebfab01cc755b28 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 11 Oct 2017 18:10:29 +0200 Subject: [PATCH 34/49] New translations firefly.php (French) --- resources/lang/fr_FR/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 678bd21ab1..35d5076947 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -836,7 +836,7 @@ return [ 'left_to_spend' => 'Restant à dépenser', 'earned' => 'Gagné', 'overspent' => 'Trop dépensé', - 'left' => 'Restant', + 'left' => 'Reste', 'no_budget' => '(pas de budget)', 'max-amount' => 'Montant maximum', 'min-amount' => 'Montant minimum', From 7bf691e2bdbc3e3aa40fcd9ad3664163f35cf443 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 13 Oct 2017 17:32:14 +0200 Subject: [PATCH 35/49] Verify deposits with budget. --- app/Console/Commands/VerifyDatabase.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 1eddd1fdab..62130e4f99 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -401,15 +401,15 @@ class VerifyDatabase extends Command $set = TransactionJournal::distinct() ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id') - ->where('transaction_types.type', TransactionType::TRANSFER) + ->whereIn('transaction_types.type', [TransactionType::TRANSFER, TransactionType::DEPOSIT]) ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']); /** @var TransactionJournal $entry */ foreach ($set as $entry) { $this->error( sprintf( - 'Error: Transaction journal #%d is a transfer, but has a budget. Edit it without changing anything, so the budget will be removed.', - $entry->id + 'Error: Transaction journal #%d is a %s, but has a budget. Edit it without changing anything, so the budget will be removed.', + $entry->id, $entry->transactionType->type ) ); } From 4c834467ae570a87bddcd2cb6b08cebe99a50ba3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 13 Oct 2017 17:34:19 +0200 Subject: [PATCH 36/49] Get all fields --- app/Console/Commands/VerifyDatabase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 62130e4f99..32a77a102b 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -402,7 +402,7 @@ class VerifyDatabase extends Command ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id') ->whereIn('transaction_types.type', [TransactionType::TRANSFER, TransactionType::DEPOSIT]) - ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.id']); + ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*']); /** @var TransactionJournal $entry */ foreach ($set as $entry) { From 15e060ea9e46f3d940f436100ffc4d9e2374bb21 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 13 Oct 2017 18:26:05 +0200 Subject: [PATCH 37/49] =?UTF-8?q?Won=E2=80=99t=20set=20budget=20for=20anyt?= =?UTF-8?q?hing=20other=20then=20withdrawals.=20#916?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/TransactionRules/Actions/SetBudget.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/TransactionRules/Actions/SetBudget.php b/app/TransactionRules/Actions/SetBudget.php index 8723ac4fe6..cd2b4bbc10 100644 --- a/app/TransactionRules/Actions/SetBudget.php +++ b/app/TransactionRules/Actions/SetBudget.php @@ -65,8 +65,8 @@ class SetBudget implements ActionInterface return true; } - if ($journal->transactionType->type === TransactionType::TRANSFER) { - Log::debug(sprintf('RuleAction SetBudget could not set budget of journal #%d to "%s" because journal is a transfer.', $journal->id, $search)); + if ($journal->transactionType->type !== TransactionType::WITHDRAWAL) { + Log::debug(sprintf('RuleAction SetBudget could not set budget of journal #%d to "%s" because journal is a %s.', $journal->id, $search, $journal->transactionType->type)); return true; } From 70ab42bc430a5046e6a58561c4bf3f0cd9401bb2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 13 Oct 2017 18:26:22 +0200 Subject: [PATCH 38/49] Will correctly join budget tables. #916 --- app/Http/Controllers/BudgetController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 79a5e03409..754a854999 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -406,7 +406,7 @@ class BudgetController extends Controller // collector: /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation(); + $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); $journals = $collector->getPaginatedJournals(); $journals->setPath(route('budgets.show', [$budget->id])); @@ -444,7 +444,7 @@ class BudgetController extends Controller /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) - ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withCategoryInformation(); + ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); $journals = $collector->getPaginatedJournals(); $journals->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); From 401ae92a6205558d04429d4f4ae9fc98e464d44b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Oct 2017 07:58:29 +0200 Subject: [PATCH 39/49] Various fixes for #916 --- app/Helpers/Collector/JournalCollector.php | 6 +----- app/Http/Controllers/BudgetController.php | 14 ++++---------- app/Http/Controllers/Chart/BudgetController.php | 7 +++---- app/Repositories/Budget/BudgetRepository.php | 2 +- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 28116cd052..c53443cf21 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -91,8 +91,6 @@ class JournalCollector implements JournalCollectorInterface 'account_types.type as account_type', ]; - /** @var bool */ - private $filterTransfers = false; /** @var array */ private $filters = [InternalTransferFilter::class]; @@ -125,7 +123,7 @@ class JournalCollector implements JournalCollectorInterface public function addFilter(string $filter): JournalCollectorInterface { $interfaces = class_implements($filter); - if (in_array(FilterInterface::class, $interfaces)) { + if (in_array(FilterInterface::class, $interfaces) && !in_array($filter, $this->filters) ) { Log::debug(sprintf('Enabled filter %s', $filter)); $this->filters[] = $filter; } @@ -237,7 +235,6 @@ class JournalCollector implements JournalCollectorInterface if ($accounts->count() > 1) { $this->addFilter(TransferFilter::class); - $this->filterTransfers = true; } @@ -261,7 +258,6 @@ class JournalCollector implements JournalCollectorInterface if ($accounts->count() > 1) { $this->addFilter(TransferFilter::class); - $this->filterTransfers = true; } return $this; diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 754a854999..9f961bf06d 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -17,13 +17,12 @@ use Carbon\Carbon; use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Http\Requests\BudgetFormRequest; use FireflyIII\Http\Requests\BudgetIncomeRequest; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\CacheProperties; @@ -447,8 +446,6 @@ class BudgetController extends Controller ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); $journals = $collector->getPaginatedJournals(); $journals->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); - - $start = session('first', Carbon::create()->startOfYear()); $end = new Carbon; $limits = $this->getLimits($budget, $start, $end); @@ -541,15 +538,12 @@ class BudgetController extends Controller return $cache->get(); // @codeCoverageIgnore } - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); - $set = $this->repository->getBudgetLimits($budget, $start, $end); - $limits = new Collection(); + $set = $this->repository->getBudgetLimits($budget, $start, $end); + $limits = new Collection(); /** @var BudgetLimit $entry */ foreach ($set as $entry) { - $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $entry->start_date, $entry->end_date); + $entry->spent = $this->repository->spentInPeriod(new Collection([$budget]), new Collection(), $entry->start_date, $entry->end_date); $limits->push($entry); } $cache->store($limits); diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index e3f137717a..04fd3dbd2b 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -175,7 +175,7 @@ class BudgetController extends Controller /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget); + $collector->setAllAssetAccounts()->setBudget($budget); if (!is_null($budgetLimit->id)) { $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); } @@ -220,7 +220,7 @@ class BudgetController extends Controller /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); - $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget)->withCategoryInformation(); + $collector->setAllAssetAccounts()->setBudget($budget)->withCategoryInformation(); if (!is_null($budgetLimit->id)) { $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); } @@ -244,7 +244,6 @@ class BudgetController extends Controller $data = $this->generator->pieChart($chartData); $cache->store($data); - return Response::json($data); } @@ -439,7 +438,7 @@ class BudgetController extends Controller { /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); - $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE]); + $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::CASH]); $grouped = $accounts->groupBy('id')->toArray(); $return = []; foreach ($accountIds as $accountId) { diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index a3a4d33aac..4961d8987d 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -492,7 +492,7 @@ class BudgetRepository implements BudgetRepositoryInterface /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setUser($this->user); - $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setBudgets($budgets); + $collector->setRange($start, $end)->setBudgets($budgets)->withBudgetInformation(); if ($accounts->count() > 0) { $collector->setAccounts($accounts); From ed237476fac63515113134d9751f350558745e99 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Oct 2017 08:06:24 +0200 Subject: [PATCH 40/49] Correct environment in example .env file. #925 --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 5d7c59fce9..3dac44c03f 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -APP_ENV=production +APP_ENV=local APP_DEBUG=false APP_NAME=FireflyIII APP_KEY=SomeRandomStringOf32CharsExactly From da980bcf9ca109d91e5ebe8cbbb7a9640c439087 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Oct 2017 08:06:34 +0200 Subject: [PATCH 41/49] Remove dev package from wrong section. --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f2a8240277..e76a2e889c 100644 --- a/composer.json +++ b/composer.json @@ -59,8 +59,7 @@ "laravel/framework": "5.5.*", "laravelcollective/html": "^5.4", "league/commonmark": "0.15.*", - "league/csv": "8.*", - "php-coveralls/php-coveralls": "^1.0", + "league/csv": "8.*" "pragmarx/google2fa": "1.*", "rcrowe/twigbridge": "0.9.*", "rmccue/requests": "1.*", @@ -73,7 +72,8 @@ "mockery/mockery": "0.9.*", "phpunit/phpunit": "~6.0", "barryvdh/laravel-debugbar": "2.*", - "barryvdh/laravel-ide-helper": "2.*" + "barryvdh/laravel-ide-helper": "2.*", + "php-coveralls/php-coveralls": "^1.0" }, "autoload": { "classmap": [ From 353b3fcba7241d6f9798865ba343ca4954f87211 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Oct 2017 08:08:14 +0200 Subject: [PATCH 42/49] Fix invalid JSON. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e76a2e889c..744919ca79 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "laravel/framework": "5.5.*", "laravelcollective/html": "^5.4", "league/commonmark": "0.15.*", - "league/csv": "8.*" + "league/csv": "8.*", "pragmarx/google2fa": "1.*", "rcrowe/twigbridge": "0.9.*", "rmccue/requests": "1.*", From 466ff4fe3c8232d1bffc51a25dfc9e7eb988789a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 07:52:15 +0200 Subject: [PATCH 43/49] Solution for #926 --- bootstrap/app.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/bootstrap/app.php b/bootstrap/app.php index 33b7ac22aa..3517e6246b 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -13,6 +13,10 @@ declare(strict_types=1); | */ +use Monolog\Formatter\LineFormatter; +use Monolog\Handler\RotatingFileHandler; +use Monolog\Logger; + bcscale(12); @@ -46,6 +50,35 @@ $app->singleton( FireflyIII\Exceptions\Handler::class ); +/* Overrule logging */ +$app->configureMonologUsing( + function (Logger $monolog) use ($app) { + $interface = php_sapi_name(); + $path = $app->storagePath() . '/logs/ff3-' . $interface . '.log'; + $level = 'debug'; + if ($app->bound('config')) { + $level = $app->make('config')->get('app.log_level', 'debug'); + } + $levels = [ + 'debug' => Logger::DEBUG, + 'info' => Logger::INFO, + 'notice' => Logger::NOTICE, + 'warning' => Logger::WARNING, + 'error' => Logger::ERROR, + 'critical' => Logger::CRITICAL, + 'alert' => Logger::ALERT, + 'emergency' => Logger::EMERGENCY, + ]; + + $useLevel = $levels[$level]; + + $formatter = new LineFormatter(null, null, true, true); + $handler = new RotatingFileHandler($path, 5, $useLevel); + $handler->setFormatter($formatter); + $monolog->pushHandler($handler); + } +); + /* |-------------------------------------------------------------------------- | Return The Application From 918ebafd7c75ee4c3fce314f8a6f68c5bdbbd7e2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 08:24:21 +0200 Subject: [PATCH 44/49] Update changelog formatting. --- CHANGELOG.md | 383 +++++++++++++++++++++++++-------------------------- 1 file changed, 185 insertions(+), 198 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43bae0b372..0a117bd2e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,104 +4,104 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [4.6.7] - 2017-10-09 ### Added -- #872, reported @gavu +- [issue 872](https://github.com/firefly-iii/firefly-iii/issues/872), reported [gavu](https://github.com/gavu) ### Fixed -- #878, fixed by @Findus23 -- #881, reported by @nicoschreiner -- #884, by @gavu -- #840, reported by @MacPaille -- #882, reported by @nicoschreiner -- #891, #892, reported by @nicoschreiner -- #891, reported by @gavu -- #827, fixed by @pkoziol -- #903, fixed by @hduijn -- #904, reported by @gavu -- #910, reported by @gavu -- #911, reported by @gavu -- #915, reported by @TomWis97 -- #917, reported by @Wr0ngName +- [issue 878](https://github.com/firefly-iii/firefly-iii/issues/878), fixed by [Findus23](https://github.com/Findus23) +- [issue 881](https://github.com/firefly-iii/firefly-iii/issues/881), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [issue 884](https://github.com/firefly-iii/firefly-iii/issues/884), by [gavu](https://github.com/gavu) +- [issue 840](https://github.com/firefly-iii/firefly-iii/issues/840), reported by [MacPaille](https://github.com/MacPaille) +- [issue 882](https://github.com/firefly-iii/firefly-iii/issues/882), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), [issue 892](https://github.com/firefly-iii/firefly-iii/issues/892), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), reported by [gavu](https://github.com/gavu) +- [issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), fixed by [pkoziol](https://github.com/pkoziol) +- [issue 903](https://github.com/firefly-iii/firefly-iii/issues/903), fixed by [hduijn](https://github.com/hduijn) +- [issue 904](https://github.com/firefly-iii/firefly-iii/issues/904), reported by [gavu](https://github.com/gavu) +- [issue 910](https://github.com/firefly-iii/firefly-iii/issues/910), reported by [gavu](https://github.com/gavu) +- [issue 911](https://github.com/firefly-iii/firefly-iii/issues/911), reported by [gavu](https://github.com/gavu) +- [issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by @TomWis97 +- [issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), reported by [Wr0ngName](https://github.com/Wr0ngName) ## [4.6.6] - 2017-09-30 ### Added -- #826, reported by @pkoziol. -- #855, by @ms32035 -- #786, by @SmilingWorlock -- #875, by @gavu -- #834, by @gavu (and others) +- [issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol). +- [issue 855](https://github.com/firefly-iii/firefly-iii/issues/855), by [ms32035](https://github.com/ms32035) +- [issue 786](https://github.com/firefly-iii/firefly-iii/issues/786), by [SmilingWorlock](https://github.com/SmilingWorlock) +- [issue 875](https://github.com/firefly-iii/firefly-iii/issues/875), by [gavu](https://github.com/gavu) +- [issue 834](https://github.com/firefly-iii/firefly-iii/issues/834), by [gavu](https://github.com/gavu) (and others) ### Changed - Upgraded to Laravel 5.5 - Add version parameter to CSS and JS files -- #823, #824 fixed Docker config by @DieBauer +- [issue 823](https://github.com/firefly-iii/firefly-iii/issues/823), [issue 824](https://github.com/firefly-iii/firefly-iii/issues/824) fixed Docker config by [DieBauer](https://github.com/DieBauer) ### Fixed -- #830 -- #822, reported by @gazben -- #827, reported by @pkoziol -- #835, reported by @gavu -- #836, reported by @pkoziol -- #838, reported by @gavu -- #839, reported by @gavu -- #843, reported by @gavu -- #837, reported by @gavu -- #845, reported by @gavu -- #846, reported by @gavu -- #848, reported by @gavu -- #854, reported by @gavu -- #866, reported by @pkoziol -- #847, reported by @gavu -- #853, reported by @gavu -- #857, reported by @pkoziol -- #865, reported by @simonsmiley -- #826, reported by @pkoziol -- #856, reported by @ms32035 -- #860, reported by @gavu -- #861, reported by @gavu -- #870, reported by @gavu +- [issue 830](https://github.com/firefly-iii/firefly-iii/issues/830) +- [issue 822](https://github.com/firefly-iii/firefly-iii/issues/822), reported by [gazben](https://github.com/gazben) +- [issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), reported by [pkoziol](https://github.com/pkoziol) +- [issue 835](https://github.com/firefly-iii/firefly-iii/issues/835), reported by [gavu](https://github.com/gavu) +- [issue 836](https://github.com/firefly-iii/firefly-iii/issues/836), reported by [pkoziol](https://github.com/pkoziol) +- [issue 838](https://github.com/firefly-iii/firefly-iii/issues/838), reported by [gavu](https://github.com/gavu) +- [issue 839](https://github.com/firefly-iii/firefly-iii/issues/839), reported by [gavu](https://github.com/gavu) +- [issue 843](https://github.com/firefly-iii/firefly-iii/issues/843), reported by [gavu](https://github.com/gavu) +- [issue 837](https://github.com/firefly-iii/firefly-iii/issues/837), reported by [gavu](https://github.com/gavu) +- [issue 845](https://github.com/firefly-iii/firefly-iii/issues/845), reported by [gavu](https://github.com/gavu) +- [issue 846](https://github.com/firefly-iii/firefly-iii/issues/846), reported by [gavu](https://github.com/gavu) +- [issue 848](https://github.com/firefly-iii/firefly-iii/issues/848), reported by [gavu](https://github.com/gavu) +- [issue 854](https://github.com/firefly-iii/firefly-iii/issues/854), reported by [gavu](https://github.com/gavu) +- [issue 866](https://github.com/firefly-iii/firefly-iii/issues/866), reported by [pkoziol](https://github.com/pkoziol) +- [issue 847](https://github.com/firefly-iii/firefly-iii/issues/847), reported by [gavu](https://github.com/gavu) +- [issue 853](https://github.com/firefly-iii/firefly-iii/issues/853), reported by [gavu](https://github.com/gavu) +- [issue 857](https://github.com/firefly-iii/firefly-iii/issues/857), reported by [pkoziol](https://github.com/pkoziol) +- [issue 865](https://github.com/firefly-iii/firefly-iii/issues/865), reported by [simonsmiley](https://github.com/simonsmiley) +- [issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol) +- [issue 856](https://github.com/firefly-iii/firefly-iii/issues/856), reported by [ms32035](https://github.com/ms32035) +- [issue 860](https://github.com/firefly-iii/firefly-iii/issues/860), reported by [gavu](https://github.com/gavu) +- [issue 861](https://github.com/firefly-iii/firefly-iii/issues/861), reported by [gavu](https://github.com/gavu) +- [issue 870](https://github.com/firefly-iii/firefly-iii/issues/870), reported by [gavu](https://github.com/gavu) ## [4.6.5] - 2017-09-09 ### Added -- #616, The ability to link transactions -- #763, as suggested by @tannie -- #770, as suggested by @skibbipl -- #780, as suggested by @skibbipl -- #784, as suggested by @SmilingWorlock +- [issue 616](https://github.com/firefly-iii/firefly-iii/issues/616), The ability to link transactions +- [issue 763](https://github.com/firefly-iii/firefly-iii/issues/763), as suggested by [tannie](https://github.com/tannie) +- [issue 770](https://github.com/firefly-iii/firefly-iii/issues/770), as suggested by [skibbipl](https://github.com/skibbipl) +- [issue 780](https://github.com/firefly-iii/firefly-iii/issues/780), as suggested by [skibbipl](https://github.com/skibbipl) +- [issue 784](https://github.com/firefly-iii/firefly-iii/issues/784), as suggested by [SmilingWorlock](https://github.com/SmilingWorlock) - Lots of code for future support of automated Bunq imports ### Changed - Rewrote the export routine -- #782, as suggested by @NiceGuyIT -- #800, as suggested by @jleeong +- [issue 782](https://github.com/firefly-iii/firefly-iii/issues/782), as suggested by [NiceGuyIT](https://github.com/NiceGuyIT) +- [issue 800](https://github.com/firefly-iii/firefly-iii/issues/800), as suggested by [jleeong](https://github.com/jleeong) ### Fixed -- #724, reported by @skibbipl -- #738, reported by @skibbipl -- #760, reported by @leander091 -- #764, reported by @tannie -- #792, reported by @jleeong -- #793, reported by @nicoschreiner -- #797, reported by @leander091 -- #801, reported by @pkoziol -- #803, reported by @pkoziol -- #805, reported by @pkoziol -- #806, reported by @pkoziol -- #807, reported by @pkoziol -- #808, reported by @pkoziol -- #809, reported by @pkoziol -- #814, reported by @nicoschreiner -- #818, reported by @gavu -- #819, reported by @DieBauer -- #820, reported by @simonsmiley +- [issue 724](https://github.com/firefly-iii/firefly-iii/issues/724), reported by [skibbipl](https://github.com/skibbipl) +- [issue 738](https://github.com/firefly-iii/firefly-iii/issues/738), reported by [skibbipl](https://github.com/skibbipl) +- [issue 760](https://github.com/firefly-iii/firefly-iii/issues/760), reported by [leander091](https://github.com/leander091) +- [issue 764](https://github.com/firefly-iii/firefly-iii/issues/764), reported by [tannie](https://github.com/tannie) +- [issue 792](https://github.com/firefly-iii/firefly-iii/issues/792), reported by [jleeong](https://github.com/jleeong) +- [issue 793](https://github.com/firefly-iii/firefly-iii/issues/793), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [issue 797](https://github.com/firefly-iii/firefly-iii/issues/797), reported by [leander091](https://github.com/leander091) +- [issue 801](https://github.com/firefly-iii/firefly-iii/issues/801), reported by [pkoziol](https://github.com/pkoziol) +- [issue 803](https://github.com/firefly-iii/firefly-iii/issues/803), reported by [pkoziol](https://github.com/pkoziol) +- [issue 805](https://github.com/firefly-iii/firefly-iii/issues/805), reported by [pkoziol](https://github.com/pkoziol) +- [issue 806](https://github.com/firefly-iii/firefly-iii/issues/806), reported by [pkoziol](https://github.com/pkoziol) +- [issue 807](https://github.com/firefly-iii/firefly-iii/issues/807), reported by [pkoziol](https://github.com/pkoziol) +- [issue 808](https://github.com/firefly-iii/firefly-iii/issues/808), reported by [pkoziol](https://github.com/pkoziol) +- [issue 809](https://github.com/firefly-iii/firefly-iii/issues/809), reported by [pkoziol](https://github.com/pkoziol) +- [issue 814](https://github.com/firefly-iii/firefly-iii/issues/814), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [issue 818](https://github.com/firefly-iii/firefly-iii/issues/818), reported by [gavu](https://github.com/gavu) +- [issue 819](https://github.com/firefly-iii/firefly-iii/issues/819), reported by [DieBauer](https://github.com/DieBauer) +- [issue 820](https://github.com/firefly-iii/firefly-iii/issues/820), reported by [simonsmiley](https://github.com/simonsmiley) - Various other fixes ## [4.6.4] - 2017-08-13 ### Added - PHP7.1 support -- Routine to decrypt attachments from the command line, for issue #671 +- Routine to decrypt attachments from the command line, for [issue 671](https://github.com/firefly-iii/firefly-iii/issues/671) - A routine that can check if your password has been stolen in the past. - Split transaction shows amount left to be split @@ -110,9 +110,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Importer can (potentially) handle new import routines such as banks. - Importer can fall back from JSON errors -### Deprecated -- Initial release. - ### Removed - PHP7.0 support - Support for extended tag modes @@ -120,27 +117,23 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed -- #717, reported by @NiceGuyIT -- #718, reported by @wtercato -- #722, reported by @simonsmiley -- #648, reported by @skibbipl -- #730, reported by @ragnarkarlsson -- #733, reported by @xpfgsyb -- #735, reported by @kristophr -- #739, reported by @skibbipl -- #515, reported by @schwalberich -- #743, reported by @simonsmiley -- #746, reported by @tannie -- #747, reported by @tannie - -### Security -- Initial release. - +- [issue 717](https://github.com/firefly-iii/firefly-iii/issues/717), reported by [NiceGuyIT](https://github.com/NiceGuyIT) +- [issue 718](https://github.com/firefly-iii/firefly-iii/issues/718), reported by [wtercato](https://github.com/wtercato) +- [issue 722](https://github.com/firefly-iii/firefly-iii/issues/722), reported by [simonsmiley](https://github.com/simonsmiley) +- [issue 648](https://github.com/firefly-iii/firefly-iii/issues/648), reported by [skibbipl](https://github.com/skibbipl) +- [issue 730](https://github.com/firefly-iii/firefly-iii/issues/730), reported by [ragnarkarlsson](https://github.com/ragnarkarlsson) +- [issue 733](https://github.com/firefly-iii/firefly-iii/issues/733), reported by [xpfgsyb](https://github.com/xpfgsyb) +- [issue 735](https://github.com/firefly-iii/firefly-iii/issues/735), reported by [kristophr](https://github.com/kristophr) +- [issue 739](https://github.com/firefly-iii/firefly-iii/issues/739), reported by [skibbipl](https://github.com/skibbipl) +- [issue 515](https://github.com/firefly-iii/firefly-iii/issues/515), reported by [schwalberich](https://github.com/schwalberich) +- [issue 743](https://github.com/firefly-iii/firefly-iii/issues/743), reported by [simonsmiley](https://github.com/simonsmiley) +- [issue 746](https://github.com/firefly-iii/firefly-iii/issues/746), reported by [tannie](https://github.com/tannie) +- [issue 747](https://github.com/firefly-iii/firefly-iii/issues/747), reported by [tannie](https://github.com/tannie) ## [4.6.3.1] - 2017-07-23 ### Fixed -- Hotfix to close issue #715 +- Hotfix to close [issue 715](https://github.com/firefly-iii/firefly-iii/issues/715) ## [4.6.3] - 2017-07-23 @@ -157,23 +150,18 @@ This will be the last release to support PHP 7.0. - Improved command line import responsiveness and speed. - All code comparisons are now strict. - Improve search page. -- Charts are easier to read thanks to @simonsmiley -- Fixed #708. +- Charts are easier to read thanks to [simonsmiley](https://github.com/simonsmiley) +- Fixed [issue 708](https://github.com/firefly-iii/firefly-iii/issues/708). ### Fixed -- Fixed bug where import would not respect default account. #694 +- Fixed bug where import would not respect default account. [issue 694](https://github.com/firefly-iii/firefly-iii/issues/694) - Fixed various broken paths - Fixed several import inconsistencies. - Various bug fixes. -### Security -- Initial release. - - - ## [4.6.2] - 2017-07-08 ### Added -- Links added to boxes, idea by @simonsmiley +- Links added to boxes, idea by [simonsmiley](https://github.com/simonsmiley) ### Fixed - Various bugs in import routine @@ -188,11 +176,10 @@ This will be the last release to support PHP 7.0. - Revamped import routine. Will be buggy. ### Fixed -- Issue #667, postgresql reported by @skibbipl. -- Issue #680 by @Xeli -- Fixed #660 -- Fixes #672, reported by @dzaikos -- Translation error fixed by +- [issue 667](https://github.com/firefly-iii/firefly-iii/issues/667), postgresql reported by [skibbipl](https://github.com/skibbipl). +- [issue 680](https://github.com/firefly-iii/firefly-iii/issues/680), fixed by [Xeli](https://github.com/Xeli) +- Fixed [issue 660](https://github.com/firefly-iii/firefly-iii/issues/660) +- Fixes [issue 672](https://github.com/firefly-iii/firefly-iii/issues/672), reported by [dzaikos](https://github.com/dzaikos) - Fix a bug where the balance routine forgot to account for accounts without a currency preference. - Various other bugfixes. @@ -202,11 +189,11 @@ This will be the last release to support PHP 7.0. - Better support for multi-currency transactions and display of transactions, accounts and everything. This requires a database overhaul (moving the currency information to specific transactions) so be careful when upgrading. - Translations for Spanish and Slovenian. - New interface for budget page, ~~stolen from~~ inspired by YNAB. -- Expanded Docker to work with postgresql as well, thanks to @kressh +- Expanded Docker to work with postgresql as well, thanks to [kressh](https://github.com/kressh) ### Fixed -- PostgreSQL support in database upgrade routine (#644, reported by @skibbipl) -- Frontpage budget chart was off, fix by @nhaarman +- PostgreSQL support in database upgrade routine ([issue 644](https://github.com/firefly-iii/firefly-iii/issues/644), reported by [skibbipl](https://github.com/skibbipl)) +- Frontpage budget chart was off, fix by [nhaarman](https://github.com/nhaarman) - Was not possible to remove opening balance. ## [4.4.3] - 2017-05-03 @@ -221,8 +208,8 @@ This will be the last release to support PHP 7.0. - The journal collector, an internal piece of code to collect transactions, now uses a slightly different method of collecting journals. This may cause problems. ### Fixed -- Issue #638 as reported by [worldworm](https://github.com/worldworm). -- Possible fix for #624 +- [issue 638](https://github.com/firefly-iii/firefly-iii/issues/638) as reported by [worldworm](https://github.com/worldworm). +- Possible fix for [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624) ## [4.4.2] - 2017-04-27 ### Fixed @@ -239,24 +226,24 @@ This will be the last release to support PHP 7.0. ## [4.4.0] - 2017-04-23 ### Added - Firefly III can now handle foreign currencies better, including some code to get the exchange rate live from the web. -- Can now make rules for attachments, see #608, as suggested by dzaikos. +- Can now make rules for attachments, see [issue 608](https://github.com/firefly-iii/firefly-iii/issues/608), as suggested by [dzaikos](https://github.com/dzaikos). ### Fixed -- Fixed #629, reported by forcaeluz -- Fixed #630, reported by welbert +- Fixed [issue 629](https://github.com/firefly-iii/firefly-iii/issues/629), reported by forcaeluz +- Fixed [issue 630](https://github.com/firefly-iii/firefly-iii/issues/630), reported by welbert - And more various bug fixes. ## [4.3.8] - 2017-04-08 ### Added - Better overview / show pages. -- #628, as reported by [xzaz](https://github.com/xzaz). +- [issue 628](https://github.com/firefly-iii/firefly-iii/issues/628), as reported by [xzaz](https://github.com/xzaz). - Greatly expanded test coverage ### Fixed -- #619, as reported by [dfiel](https://github.com/dfiel). -- #620, as reported by [forcaeluz](https://github.com/forcaeluz). -- Attempt to fix #624, as reported by [TheSerenin](https://github.com/TheSerenin). +- [issue 619](https://github.com/firefly-iii/firefly-iii/issues/619), as reported by [dfiel](https://github.com/dfiel). +- [issue 620](https://github.com/firefly-iii/firefly-iii/issues/620), as reported by [forcaeluz](https://github.com/forcaeluz). +- Attempt to fix [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624), as reported by [TheSerenin](https://github.com/TheSerenin). - Favicon link is relative now, fixed by [welbert](https://github.com/welbert). - Some search bugs @@ -274,61 +261,61 @@ This will be the last release to support PHP 7.0. - Slightly changed account overview. ### Removed -- Removed IDE specific views from .gitignore, issue #598 +- Removed IDE specific views from .gitignore, [issue 598](https://github.com/firefly-iii/firefly-iii/issues/598) ### Fixed - Force key generation during installation. - The `date` function takes the fieldname where a date is stored, not the literal date by [Zsub](https://github.com/Zsub) - Improved budget frontpage chart, as suggested by [skibbipl](https://github.com/skibbipl) -- Issue #602 and #607, as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos). -- Issue #605, as reported by [Zsub](https://github.com/Zsub). -- Issue #599, as reported by [leander091](https://github.com/leander091). -- Issue #610, as reported by [skibbipl](https://github.com/skibbipl). -- Issue #611, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). -- Issue #612, as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). -- Issue #614, as reported by [worldworm](https://github.com/worldworm). +- [issue 602](https://github.com/firefly-iii/firefly-iii/issues/602) and [issue 607](https://github.com/firefly-iii/firefly-iii/issues/607), as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos). +- [issue 605](https://github.com/firefly-iii/firefly-iii/issues/605), as reported by [Zsub](https://github.com/Zsub). +- [issue 599](https://github.com/firefly-iii/firefly-iii/issues/599), as reported by [leander091](https://github.com/leander091). +- [issue 610](https://github.com/firefly-iii/firefly-iii/issues/610), as reported by [skibbipl](https://github.com/skibbipl). +- [issue 611](https://github.com/firefly-iii/firefly-iii/issues/611), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). +- [issue 612](https://github.com/firefly-iii/firefly-iii/issues/612), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). +- [issue 614](https://github.com/firefly-iii/firefly-iii/issues/614), as reported by [worldworm](https://github.com/worldworm). - Various other bug fixes. ## [4.3.6] - 2017-02-20 ### Fixed -- #578, reported by [xpfgsyb](https://github.com/xpfgsyb). +- [issue 578](https://github.com/firefly-iii/firefly-iii/issues/578), reported by [xpfgsyb](https://github.com/xpfgsyb). ## [4.3.5] - 2017-02-19 ### Added - Beta support for Sandstorm.IO -- Docker support by [@schoentoon](https://github.com/schoentoon), [@elohmeier](https://github.com/elohmeier), [@patrickkostjens](https://github.com/patrickkostjens) and [@crash7](https://github.com/crash7)! +- Docker support by [schoentoon](https://github.com/schoentoon), [elohmeier](https://github.com/elohmeier), [patrickkostjens](https://github.com/patrickkostjens) and [crash7](https://github.com/crash7)! - Can now use special keywords in the search to search for specic dates, categories, etc. ### Changed - Updated to laravel 5.4! - User friendly error message -- Updated locales to support more operating systems, first reported in #536 by [dabenzel](https://github.com/dabenzel) +- Updated locales to support more operating systems, first reported in [issue 536](https://github.com/firefly-iii/firefly-iii/issues/536) by [dabenzel](https://github.com/dabenzel) - Updated budget report - Improved 404 page - Smooth curves, improved by [elamperti](https://github.com/elamperti). ### Fixed -- #549 -- #553 -- Fixed #559 reported by [elamperti](https://github.com/elamperti). -- #565, as reported by a user over the mail -- #566, as reported by [dspeckmann](https://github.com/dspeckmann) -- #567, as reported by [winsomniak](https://github.com/winsomniak) -- #569, as reported by [winsomniak](https://github.com/winsomniak) -- #572, as reported by [zjean](https://github.com/zjean) +- [issue 549](https://github.com/firefly-iii/firefly-iii/issues/549) +- [issue 553](https://github.com/firefly-iii/firefly-iii/issues/553) +- Fixed [issue 559](https://github.com/firefly-iii/firefly-iii/issues/559) reported by [elamperti](https://github.com/elamperti). +- [issue 565](https://github.com/firefly-iii/firefly-iii/issues/565), as reported by a user over the mail +- [issue 566](https://github.com/firefly-iii/firefly-iii/issues/566), as reported by [dspeckmann](https://github.com/dspeckmann) +- [issue 567](https://github.com/firefly-iii/firefly-iii/issues/567), as reported by [winsomniak](https://github.com/winsomniak) +- [issue 569](https://github.com/firefly-iii/firefly-iii/issues/569), as reported by [winsomniak](https://github.com/winsomniak) +- [issue 572](https://github.com/firefly-iii/firefly-iii/issues/572), as reported by [zjean](https://github.com/zjean) - Many issues with the transaction filters which will fix reports (they tended to display the wrong amount). ## [4.3.4] - 2017-02-02 ### Fixed -- Fixed bug #550, reported by [worldworm](https://github.com/worldworm)! -- Fixed bug #551, reported by [t-me](https://github.com/t-me)! +- Fixed bug [issue 550](https://github.com/firefly-iii/firefly-iii/issues/550), reported by [worldworm](https://github.com/worldworm)! +- Fixed bug [issue 551](https://github.com/firefly-iii/firefly-iii/issues/551), reported by [t-me](https://github.com/t-me)! ## [4.3.3] - 2017-01-30 _The 100th release of Firefly!_ ### Added -- Add locales to Docker (#534) by [elohmeier](https://github.com/elohmeier). +- Add locales to Docker ([issue 534](https://github.com/firefly-iii/firefly-iii/issues/534)) by [elohmeier](https://github.com/elohmeier). - Optional database encryption. On by default. - Datepicker for Firefox and other browsers. - New instruction block for updating and installing. @@ -351,7 +338,7 @@ _The 100th release of Firefly!_ An intermediate release because something in the Twig and Twigbridge libraries is broken and I have to make sure it doesn't affect you guys. But some cool features were on their way so there's that oo. ### Added -- Some code for issue #475, consistent overviews. +- Some code for [issue 475](https://github.com/firefly-iii/firefly-iii/issues/475), consistent overviews. - Better currency display. Make sure you have locale packages installed. ### Changed @@ -359,56 +346,56 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - The password reset routine was broken. -- Issue #522, thanks to [xpfgsyb](https://github.com/xpfgsyb) -- Issue #524, thanks to [worldworm](https://github.com/worldworm) -- Issue #526, thanks to [worldworm](https://github.com/worldworm) -- Issue #528, thanks to [skibbipl](https://github.com/skibbipl) +- [issue 522](https://github.com/firefly-iii/firefly-iii/issues/522), thanks to [xpfgsyb](https://github.com/xpfgsyb) +- [issue 524](https://github.com/firefly-iii/firefly-iii/issues/524), thanks to [worldworm](https://github.com/worldworm) +- [issue 526](https://github.com/firefly-iii/firefly-iii/issues/526), thanks to [worldworm](https://github.com/worldworm) +- [issue 528](https://github.com/firefly-iii/firefly-iii/issues/528), thanks to [skibbipl](https://github.com/skibbipl) - Various other fixes. ## [4.3.1] - 2017-01-04 ### Added - Support for Russian and Polish. - Support for a proper demo website. -- Support for custom decimal places in currencies (#506, suggested by [xpfgsyb](https://github.com/xpfgsyb)). -- Most amounts are now right-aligned (#511, suggested by [xpfgsyb](https://github.com/xpfgsyb)). +- Support for custom decimal places in currencies ([issue 506](https://github.com/firefly-iii/firefly-iii/issues/506), suggested by [xpfgsyb](https://github.com/xpfgsyb)). +- Most amounts are now right-aligned ([issue 511](https://github.com/firefly-iii/firefly-iii/issues/511), suggested by [xpfgsyb](https://github.com/xpfgsyb)). - German is now a "complete" language, more than 75% translated! ### Changed - **[New Github repository!](github.com/firefly-iii/firefly-iii)** - Better category overview. -- #502, thanks to [zjean](https://github.com/zjean) +- [issue 502](https://github.com/firefly-iii/firefly-iii/issues/502), thanks to [zjean](https://github.com/zjean) ### Removed - Removed a lot of administration functions. - Removed ability to activate users. ### Fixed -- #501, thanks to [zjean](https://github.com/zjean) -- #513, thanks to [skibbipl](https://github.com/skibbipl) +- [issue 501](https://github.com/firefly-iii/firefly-iii/issues/501), thanks to [zjean](https://github.com/zjean) +- [issue 513](https://github.com/firefly-iii/firefly-iii/issues/513), thanks to [skibbipl](https://github.com/skibbipl) ### Security -- #519, thanks to [xpfgsyb](https://github.com/xpfgsyb) +- [issue 519](https://github.com/firefly-iii/firefly-iii/issues/519), thanks to [xpfgsyb](https://github.com/xpfgsyb) ## [4.3.0] - 2016-12-26 ### Added -- New method of keeping track of available budget, see issue #489 +- New method of keeping track of available budget, see [issue 489](https://github.com/firefly-iii/firefly-iii/issues/489) - Support for Spanish - Firefly III now has an extended demo mode. Will expand further in the future. ### Changed - New favicon -- Import routine no longer gives transactions a description #483 +- Import routine no longer gives transactions a description [issue 483](https://github.com/firefly-iii/firefly-iii/issues/483) ### Removed - All test data generation code. ### Fixed -- Removed import accounts from search results #478 -- Redirect after delete will no longer go back to deleted item #477 -- Cannot math #482 -- Fixed bug in virtual balance field #479 +- Removed import accounts from search results [issue 478](https://github.com/firefly-iii/firefly-iii/issues/478) +- Redirect after delete will no longer go back to deleted item [issue 477](https://github.com/firefly-iii/firefly-iii/issues/477) +- Cannot math [issue 482](https://github.com/firefly-iii/firefly-iii/issues/482) +- Fixed bug in virtual balance field [issue 479](https://github.com/firefly-iii/firefly-iii/issues/479) ## [4.2.2] - 2016-12-18 ### Added @@ -420,25 +407,25 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Various bugs -- Issue #472 thanks to [zjean](https://github.com/zjean) +- [issue 472](https://github.com/firefly-iii/firefly-iii/issues/472) thanks to [zjean](https://github.com/zjean) ## [4.2.1] - 2016-12-09 ### Added -- BIC support (see #430) +- BIC support (see [issue 430](https://github.com/firefly-iii/firefly-iii/issues/430)) - New category report section and chart (see the general financial report) ### Changed -- Date range picker now also available on mobile devices (see #435) -- Extended range of amounts for issue #439 +- Date range picker now also available on mobile devices (see [issue 435](https://github.com/firefly-iii/firefly-iii/issues/435)) +- Extended range of amounts for [issue 439](https://github.com/firefly-iii/firefly-iii/issues/439) - Rewrote all routes. Old bookmarks may break. ## [4.2.0] - 2016-11-27 ### Added - Lots of (empty) tests -- Expanded transaction lists (#377) +- Expanded transaction lists ([issue 377](https://github.com/firefly-iii/firefly-iii/issues/377)) - New charts at account view -- First code for #305 +- First code for [issue 305](https://github.com/firefly-iii/firefly-iii/issues/305) ### Changed @@ -446,12 +433,12 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Made some fonts local ### Fixed -- Issue #408 +- [issue 408](https://github.com/firefly-iii/firefly-iii/issues/408) - Various issues with split journals -- Issue #414, thx [zjean](https://github.com/zjean) -- Issue #419, thx [schwalberich](https://github.com/schwalberich) -- Issue #422, thx [xzaz](https://github.com/xzaz) -- Various import bugs, such as #416 ([zjean](https://github.com/zjean)) +- [issue 414](https://github.com/firefly-iii/firefly-iii/issues/414), thx [zjean](https://github.com/zjean) +- [issue 419](https://github.com/firefly-iii/firefly-iii/issues/419), thx [schwalberich](https://github.com/schwalberich) +- [issue 422](https://github.com/firefly-iii/firefly-iii/issues/422), thx [xzaz](https://github.com/xzaz) +- Various import bugs, such as [issue 416](https://github.com/firefly-iii/firefly-iii/issues/416) ([zjean](https://github.com/zjean)) ## [4.1.7] - 2016-11-19 ### Added @@ -468,9 +455,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Made all pages more mobile friendly. -- Fixed #395 found by [marcoveeneman](https://github.com/marcoveeneman). -- Fixed #398 found by [marcoveeneman](https://github.com/marcoveeneman). -- Fixed #401 found by [marcoveeneman](https://github.com/marcoveeneman). +- Fixed [issue 395](https://github.com/firefly-iii/firefly-iii/issues/395) found by [marcoveeneman](https://github.com/marcoveeneman). +- Fixed [issue 398](https://github.com/firefly-iii/firefly-iii/issues/398) found by [marcoveeneman](https://github.com/marcoveeneman). +- Fixed [issue 401](https://github.com/firefly-iii/firefly-iii/issues/401) found by [marcoveeneman](https://github.com/marcoveeneman). - Many optimizations. - Updated many libraries. - Various bugs found by myself. @@ -486,9 +473,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Rebuilt seach engine. ### Fixed -- #375, thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies. -- #370 thanks to [ksmolder](https://github.com/ksmolder) -- #378, thanks to [HomelessAvatar](https://github.com/HomelessAvatar) +- [issue 375](https://github.com/firefly-iii/firefly-iii/issues/375), thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies. +- [issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) thanks to [ksmolder](https://github.com/ksmolder) +- [issue 378](https://github.com/firefly-iii/firefly-iii/issues/378), thanks to [HomelessAvatar](https://github.com/HomelessAvatar) ## [4.1.5] - 2016-11-01 ### Changed @@ -497,7 +484,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Help content is translated through Crowdin. ### Fixed -- Issue #370 +- [issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) ## [4.1.4] - 2016-10-30 ### Added @@ -514,10 +501,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Change error message to refer to solution. ### Fixed -- #367 thanks to [HungryFeline](https://github.com/HungryFeline) -- #366 thanks to [3mz3t](https://github.com/3mz3t) -- #362 and #341 thanks to [bnw](https://github.com/bnw) -- #355 thanks to [roberthorlings](https://github.com/roberthorlings) +- [issue 367](https://github.com/firefly-iii/firefly-iii/issues/367) thanks to [HungryFeline](https://github.com/HungryFeline) +- [issue 366](https://github.com/firefly-iii/firefly-iii/issues/366) thanks to [3mz3t](https://github.com/3mz3t) +- [issue 362](https://github.com/firefly-iii/firefly-iii/issues/362) and [issue 341](https://github.com/firefly-iii/firefly-iii/issues/341) thanks to [bnw](https://github.com/bnw) +- [issue 355](https://github.com/firefly-iii/firefly-iii/issues/355) thanks to [roberthorlings](https://github.com/roberthorlings) ## [4.1.3] - 2016-10-22 ### Fixed @@ -548,7 +535,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Lots of old code ### Fixed -- #357, where non utf-8 files would break Firefly. +- [issue 357](https://github.com/firefly-iii/firefly-iii/issues/357), where non utf-8 files would break Firefly. - Tab delimiter is not properly loaded from import configuration ([roberthorlings](https://github.com/roberthorlings)) - System response to yearly bills @@ -559,9 +546,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Changed - Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) -- Fixed #344 -- Fixed #346, thanks to [SanderKleykens](https://github.com/SanderKleykens) -- #351 +- Fixed [issue 344](https://github.com/firefly-iii/firefly-iii/issues/344) +- Fixed [issue 346](https://github.com/firefly-iii/firefly-iii/issues/346), thanks to [SanderKleykens](https://github.com/SanderKleykens) +- [issue 351](https://github.com/firefly-iii/firefly-iii/issues/351) - Did some internal remodelling. ### Fixed @@ -572,15 +559,15 @@ An intermediate release because something in the Twig and Twigbridge libraries i ## [4.0.1] - 2016-10-04 ### Added - New ING import specific by [tomwerf](https://github.com/tomwerf) -- New Presidents Choice specific to fix #307 -- Added some trimming (#335) +- New Presidents Choice specific to fix [issue 307](https://github.com/firefly-iii/firefly-iii/issues/307) +- Added some trimming ([issue 335](https://github.com/firefly-iii/firefly-iii/issues/335)) ### Fixed - Fixed a bug where incoming transactions would not be properly filtered in several reports. -- #334 by [cyberkov](https://github.com/cyberkov) -- #337 -- #336 -- #338 found by [roberthorlings](https://github.com/roberthorlings) +- [issue 334](https://github.com/firefly-iii/firefly-iii/issues/334) by [cyberkov](https://github.com/cyberkov) +- [issue 337](https://github.com/firefly-iii/firefly-iii/issues/337) +- [issue 336](https://github.com/firefly-iii/firefly-iii/issues/336) +- [issue 338](https://github.com/firefly-iii/firefly-iii/issues/338) found by [roberthorlings](https://github.com/roberthorlings) ## [4.0.0] - 2016-09-26 ### Added @@ -607,7 +594,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ## [3.10.3] - 2016-08-29 ### Added -- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) (#282) +- More fields for mass-edit, thanks to [vissert](https://github.com/vissert) ([issue 282](https://github.com/firefly-iii/firefly-iii/issues/282)) - First start of German translation ### Changed @@ -638,7 +625,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Bug in the mass edit routines. -- Firefly III over a proxy will now work (see [issue #290](https://github.com/firefly-iii/firefly-iii/issues/290)), thanks [dfiel](https://github.com/dfiel) for reporting. +- Firefly III over a proxy will now work (see [issue 290](https://github.com/firefly-iii/firefly-iii/issues/290), thanks [dfiel](https://github.com/dfiel) for reporting. - Sneaky bug in the import routine, fixed by [Bonno](https://github.com/Bonno) ## [3.10.1] - 2016-08-25 @@ -672,25 +659,25 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Changed - Rewrote the import routine. - The date picker now supports more ranges and periods. -- Rewrote all migrations. #272 +- Rewrote all migrations. [issue 272](https://github.com/firefly-iii/firefly-iii/issues/272) ### Fixed -- Issue #264 -- Issue #265 -- Fixed amount calculation problems, #266, thanks [xzaz](https://github.com/xzaz) -- Issue #271 -- Issue #278, #273, thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella) +- [issue 264](https://github.com/firefly-iii/firefly-iii/issues/264) +- [issue 265](https://github.com/firefly-iii/firefly-iii/issues/265) +- Fixed amount calculation problems, [issue 266](https://github.com/firefly-iii/firefly-iii/issues/266), thanks [xzaz](https://github.com/xzaz) +- [issue 271](https://github.com/firefly-iii/firefly-iii/issues/271) +- [issue 278](https://github.com/firefly-iii/firefly-iii/issues/278), [issue 273](https://github.com/firefly-iii/firefly-iii/issues/273), thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella) - Bug in attachment download routine would report the wrong size to the user's browser. - Various NULL errors fixed. - Various strict typing errors fixed. -- Fixed pagination problems, #276, thanks [xzaz](https://github.com/xzaz) +- Fixed pagination problems, [issue 276](https://github.com/firefly-iii/firefly-iii/issues/276), thanks [xzaz](https://github.com/xzaz) - Fixed a bug where an expense would be assigned to a piggy bank if you created a transfer first. -- Bulk update problems, #280, thanks [stickgrinder](https://github.com/stickgrinder) +- Bulk update problems, [issue 280](https://github.com/firefly-iii/firefly-iii/issues/280), thanks [stickgrinder](https://github.com/stickgrinder) - Fixed various problems with amount reporting of split transactions. ## [3.9.1] - 2016-06-06 ### Fixed -- Fixed a bug where removing money from a piggy bank would not work. See issue #265 and #269 +- Fixed a bug where removing money from a piggy bank would not work. See [issue 265](https://github.com/firefly-iii/firefly-iii/issues/265) and [issue 269](https://github.com/firefly-iii/firefly-iii/issues/269) ## [3.9.0] - 2016-05-22 ### Added From 2dae7f40e1f6f6301c2c31fc14fbfb56d6e3cbaf Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 08:26:13 +0200 Subject: [PATCH 45/49] Small updates in change log [skip ci] --- CHANGELOG.md | 266 +++++++++++++++++++++++++-------------------------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a117bd2e0..757aadb090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,97 +4,97 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [4.6.7] - 2017-10-09 ### Added -- [issue 872](https://github.com/firefly-iii/firefly-iii/issues/872), reported [gavu](https://github.com/gavu) +- [Issue 872](https://github.com/firefly-iii/firefly-iii/issues/872), reported [gavu](https://github.com/gavu) ### Fixed -- [issue 878](https://github.com/firefly-iii/firefly-iii/issues/878), fixed by [Findus23](https://github.com/Findus23) -- [issue 881](https://github.com/firefly-iii/firefly-iii/issues/881), reported by [nicoschreiner](https://github.com/nicoschreiner) -- [issue 884](https://github.com/firefly-iii/firefly-iii/issues/884), by [gavu](https://github.com/gavu) -- [issue 840](https://github.com/firefly-iii/firefly-iii/issues/840), reported by [MacPaille](https://github.com/MacPaille) -- [issue 882](https://github.com/firefly-iii/firefly-iii/issues/882), reported by [nicoschreiner](https://github.com/nicoschreiner) -- [issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), [issue 892](https://github.com/firefly-iii/firefly-iii/issues/892), reported by [nicoschreiner](https://github.com/nicoschreiner) -- [issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), reported by [gavu](https://github.com/gavu) -- [issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), fixed by [pkoziol](https://github.com/pkoziol) -- [issue 903](https://github.com/firefly-iii/firefly-iii/issues/903), fixed by [hduijn](https://github.com/hduijn) -- [issue 904](https://github.com/firefly-iii/firefly-iii/issues/904), reported by [gavu](https://github.com/gavu) -- [issue 910](https://github.com/firefly-iii/firefly-iii/issues/910), reported by [gavu](https://github.com/gavu) -- [issue 911](https://github.com/firefly-iii/firefly-iii/issues/911), reported by [gavu](https://github.com/gavu) -- [issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by @TomWis97 -- [issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), reported by [Wr0ngName](https://github.com/Wr0ngName) +- [Issue 878](https://github.com/firefly-iii/firefly-iii/issues/878), fixed by [Findus23](https://github.com/Findus23) +- [Issue 881](https://github.com/firefly-iii/firefly-iii/issues/881), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [Issue 884](https://github.com/firefly-iii/firefly-iii/issues/884), by [gavu](https://github.com/gavu) +- [Issue 840](https://github.com/firefly-iii/firefly-iii/issues/840), reported by [MacPaille](https://github.com/MacPaille) +- [Issue 882](https://github.com/firefly-iii/firefly-iii/issues/882), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [Issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), [issue 892](https://github.com/firefly-iii/firefly-iii/issues/892), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [Issue 891](https://github.com/firefly-iii/firefly-iii/issues/891), reported by [gavu](https://github.com/gavu) +- [Issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), fixed by [pkoziol](https://github.com/pkoziol) +- [Issue 903](https://github.com/firefly-iii/firefly-iii/issues/903), fixed by [hduijn](https://github.com/hduijn) +- [Issue 904](https://github.com/firefly-iii/firefly-iii/issues/904), reported by [gavu](https://github.com/gavu) +- [Issue 910](https://github.com/firefly-iii/firefly-iii/issues/910), reported by [gavu](https://github.com/gavu) +- [Issue 911](https://github.com/firefly-iii/firefly-iii/issues/911), reported by [gavu](https://github.com/gavu) +- [Issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by @TomWis97 +- [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), reported by [Wr0ngName](https://github.com/Wr0ngName) ## [4.6.6] - 2017-09-30 ### Added -- [issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol). -- [issue 855](https://github.com/firefly-iii/firefly-iii/issues/855), by [ms32035](https://github.com/ms32035) -- [issue 786](https://github.com/firefly-iii/firefly-iii/issues/786), by [SmilingWorlock](https://github.com/SmilingWorlock) -- [issue 875](https://github.com/firefly-iii/firefly-iii/issues/875), by [gavu](https://github.com/gavu) -- [issue 834](https://github.com/firefly-iii/firefly-iii/issues/834), by [gavu](https://github.com/gavu) (and others) +- [Issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol). +- [Issue 855](https://github.com/firefly-iii/firefly-iii/issues/855), by [ms32035](https://github.com/ms32035) +- [Issue 786](https://github.com/firefly-iii/firefly-iii/issues/786), by [SmilingWorlock](https://github.com/SmilingWorlock) +- [Issue 875](https://github.com/firefly-iii/firefly-iii/issues/875), by [gavu](https://github.com/gavu) +- [Issue 834](https://github.com/firefly-iii/firefly-iii/issues/834), by [gavu](https://github.com/gavu) (and others) ### Changed - Upgraded to Laravel 5.5 - Add version parameter to CSS and JS files -- [issue 823](https://github.com/firefly-iii/firefly-iii/issues/823), [issue 824](https://github.com/firefly-iii/firefly-iii/issues/824) fixed Docker config by [DieBauer](https://github.com/DieBauer) +- [Issue 823](https://github.com/firefly-iii/firefly-iii/issues/823), [issue 824](https://github.com/firefly-iii/firefly-iii/issues/824) fixed Docker config by [DieBauer](https://github.com/DieBauer) ### Fixed -- [issue 830](https://github.com/firefly-iii/firefly-iii/issues/830) -- [issue 822](https://github.com/firefly-iii/firefly-iii/issues/822), reported by [gazben](https://github.com/gazben) -- [issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), reported by [pkoziol](https://github.com/pkoziol) -- [issue 835](https://github.com/firefly-iii/firefly-iii/issues/835), reported by [gavu](https://github.com/gavu) -- [issue 836](https://github.com/firefly-iii/firefly-iii/issues/836), reported by [pkoziol](https://github.com/pkoziol) -- [issue 838](https://github.com/firefly-iii/firefly-iii/issues/838), reported by [gavu](https://github.com/gavu) -- [issue 839](https://github.com/firefly-iii/firefly-iii/issues/839), reported by [gavu](https://github.com/gavu) -- [issue 843](https://github.com/firefly-iii/firefly-iii/issues/843), reported by [gavu](https://github.com/gavu) -- [issue 837](https://github.com/firefly-iii/firefly-iii/issues/837), reported by [gavu](https://github.com/gavu) -- [issue 845](https://github.com/firefly-iii/firefly-iii/issues/845), reported by [gavu](https://github.com/gavu) -- [issue 846](https://github.com/firefly-iii/firefly-iii/issues/846), reported by [gavu](https://github.com/gavu) -- [issue 848](https://github.com/firefly-iii/firefly-iii/issues/848), reported by [gavu](https://github.com/gavu) -- [issue 854](https://github.com/firefly-iii/firefly-iii/issues/854), reported by [gavu](https://github.com/gavu) -- [issue 866](https://github.com/firefly-iii/firefly-iii/issues/866), reported by [pkoziol](https://github.com/pkoziol) -- [issue 847](https://github.com/firefly-iii/firefly-iii/issues/847), reported by [gavu](https://github.com/gavu) -- [issue 853](https://github.com/firefly-iii/firefly-iii/issues/853), reported by [gavu](https://github.com/gavu) -- [issue 857](https://github.com/firefly-iii/firefly-iii/issues/857), reported by [pkoziol](https://github.com/pkoziol) -- [issue 865](https://github.com/firefly-iii/firefly-iii/issues/865), reported by [simonsmiley](https://github.com/simonsmiley) -- [issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol) -- [issue 856](https://github.com/firefly-iii/firefly-iii/issues/856), reported by [ms32035](https://github.com/ms32035) -- [issue 860](https://github.com/firefly-iii/firefly-iii/issues/860), reported by [gavu](https://github.com/gavu) -- [issue 861](https://github.com/firefly-iii/firefly-iii/issues/861), reported by [gavu](https://github.com/gavu) -- [issue 870](https://github.com/firefly-iii/firefly-iii/issues/870), reported by [gavu](https://github.com/gavu) +- [Issue 830](https://github.com/firefly-iii/firefly-iii/issues/830) +- [Issue 822](https://github.com/firefly-iii/firefly-iii/issues/822), reported by [gazben](https://github.com/gazben) +- [Issue 827](https://github.com/firefly-iii/firefly-iii/issues/827), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 835](https://github.com/firefly-iii/firefly-iii/issues/835), reported by [gavu](https://github.com/gavu) +- [Issue 836](https://github.com/firefly-iii/firefly-iii/issues/836), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 838](https://github.com/firefly-iii/firefly-iii/issues/838), reported by [gavu](https://github.com/gavu) +- [Issue 839](https://github.com/firefly-iii/firefly-iii/issues/839), reported by [gavu](https://github.com/gavu) +- [Issue 843](https://github.com/firefly-iii/firefly-iii/issues/843), reported by [gavu](https://github.com/gavu) +- [Issue 837](https://github.com/firefly-iii/firefly-iii/issues/837), reported by [gavu](https://github.com/gavu) +- [Issue 845](https://github.com/firefly-iii/firefly-iii/issues/845), reported by [gavu](https://github.com/gavu) +- [Issue 846](https://github.com/firefly-iii/firefly-iii/issues/846), reported by [gavu](https://github.com/gavu) +- [Issue 848](https://github.com/firefly-iii/firefly-iii/issues/848), reported by [gavu](https://github.com/gavu) +- [Issue 854](https://github.com/firefly-iii/firefly-iii/issues/854), reported by [gavu](https://github.com/gavu) +- [Issue 866](https://github.com/firefly-iii/firefly-iii/issues/866), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 847](https://github.com/firefly-iii/firefly-iii/issues/847), reported by [gavu](https://github.com/gavu) +- [Issue 853](https://github.com/firefly-iii/firefly-iii/issues/853), reported by [gavu](https://github.com/gavu) +- [Issue 857](https://github.com/firefly-iii/firefly-iii/issues/857), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 865](https://github.com/firefly-iii/firefly-iii/issues/865), reported by [simonsmiley](https://github.com/simonsmiley) +- [Issue 826](https://github.com/firefly-iii/firefly-iii/issues/826), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 856](https://github.com/firefly-iii/firefly-iii/issues/856), reported by [ms32035](https://github.com/ms32035) +- [Issue 860](https://github.com/firefly-iii/firefly-iii/issues/860), reported by [gavu](https://github.com/gavu) +- [Issue 861](https://github.com/firefly-iii/firefly-iii/issues/861), reported by [gavu](https://github.com/gavu) +- [Issue 870](https://github.com/firefly-iii/firefly-iii/issues/870), reported by [gavu](https://github.com/gavu) ## [4.6.5] - 2017-09-09 ### Added -- [issue 616](https://github.com/firefly-iii/firefly-iii/issues/616), The ability to link transactions -- [issue 763](https://github.com/firefly-iii/firefly-iii/issues/763), as suggested by [tannie](https://github.com/tannie) -- [issue 770](https://github.com/firefly-iii/firefly-iii/issues/770), as suggested by [skibbipl](https://github.com/skibbipl) -- [issue 780](https://github.com/firefly-iii/firefly-iii/issues/780), as suggested by [skibbipl](https://github.com/skibbipl) -- [issue 784](https://github.com/firefly-iii/firefly-iii/issues/784), as suggested by [SmilingWorlock](https://github.com/SmilingWorlock) +- [Issue 616](https://github.com/firefly-iii/firefly-iii/issues/616), The ability to link transactions +- [Issue 763](https://github.com/firefly-iii/firefly-iii/issues/763), as suggested by [tannie](https://github.com/tannie) +- [Issue 770](https://github.com/firefly-iii/firefly-iii/issues/770), as suggested by [skibbipl](https://github.com/skibbipl) +- [Issue 780](https://github.com/firefly-iii/firefly-iii/issues/780), as suggested by [skibbipl](https://github.com/skibbipl) +- [Issue 784](https://github.com/firefly-iii/firefly-iii/issues/784), as suggested by [SmilingWorlock](https://github.com/SmilingWorlock) - Lots of code for future support of automated Bunq imports ### Changed - Rewrote the export routine -- [issue 782](https://github.com/firefly-iii/firefly-iii/issues/782), as suggested by [NiceGuyIT](https://github.com/NiceGuyIT) -- [issue 800](https://github.com/firefly-iii/firefly-iii/issues/800), as suggested by [jleeong](https://github.com/jleeong) +- [Issue 782](https://github.com/firefly-iii/firefly-iii/issues/782), as suggested by [NiceGuyIT](https://github.com/NiceGuyIT) +- [Issue 800](https://github.com/firefly-iii/firefly-iii/issues/800), as suggested by [jleeong](https://github.com/jleeong) ### Fixed -- [issue 724](https://github.com/firefly-iii/firefly-iii/issues/724), reported by [skibbipl](https://github.com/skibbipl) -- [issue 738](https://github.com/firefly-iii/firefly-iii/issues/738), reported by [skibbipl](https://github.com/skibbipl) -- [issue 760](https://github.com/firefly-iii/firefly-iii/issues/760), reported by [leander091](https://github.com/leander091) -- [issue 764](https://github.com/firefly-iii/firefly-iii/issues/764), reported by [tannie](https://github.com/tannie) -- [issue 792](https://github.com/firefly-iii/firefly-iii/issues/792), reported by [jleeong](https://github.com/jleeong) -- [issue 793](https://github.com/firefly-iii/firefly-iii/issues/793), reported by [nicoschreiner](https://github.com/nicoschreiner) -- [issue 797](https://github.com/firefly-iii/firefly-iii/issues/797), reported by [leander091](https://github.com/leander091) -- [issue 801](https://github.com/firefly-iii/firefly-iii/issues/801), reported by [pkoziol](https://github.com/pkoziol) -- [issue 803](https://github.com/firefly-iii/firefly-iii/issues/803), reported by [pkoziol](https://github.com/pkoziol) -- [issue 805](https://github.com/firefly-iii/firefly-iii/issues/805), reported by [pkoziol](https://github.com/pkoziol) -- [issue 806](https://github.com/firefly-iii/firefly-iii/issues/806), reported by [pkoziol](https://github.com/pkoziol) -- [issue 807](https://github.com/firefly-iii/firefly-iii/issues/807), reported by [pkoziol](https://github.com/pkoziol) -- [issue 808](https://github.com/firefly-iii/firefly-iii/issues/808), reported by [pkoziol](https://github.com/pkoziol) -- [issue 809](https://github.com/firefly-iii/firefly-iii/issues/809), reported by [pkoziol](https://github.com/pkoziol) -- [issue 814](https://github.com/firefly-iii/firefly-iii/issues/814), reported by [nicoschreiner](https://github.com/nicoschreiner) -- [issue 818](https://github.com/firefly-iii/firefly-iii/issues/818), reported by [gavu](https://github.com/gavu) -- [issue 819](https://github.com/firefly-iii/firefly-iii/issues/819), reported by [DieBauer](https://github.com/DieBauer) -- [issue 820](https://github.com/firefly-iii/firefly-iii/issues/820), reported by [simonsmiley](https://github.com/simonsmiley) +- [Issue 724](https://github.com/firefly-iii/firefly-iii/issues/724), reported by [skibbipl](https://github.com/skibbipl) +- [Issue 738](https://github.com/firefly-iii/firefly-iii/issues/738), reported by [skibbipl](https://github.com/skibbipl) +- [Issue 760](https://github.com/firefly-iii/firefly-iii/issues/760), reported by [leander091](https://github.com/leander091) +- [Issue 764](https://github.com/firefly-iii/firefly-iii/issues/764), reported by [tannie](https://github.com/tannie) +- [Issue 792](https://github.com/firefly-iii/firefly-iii/issues/792), reported by [jleeong](https://github.com/jleeong) +- [Issue 793](https://github.com/firefly-iii/firefly-iii/issues/793), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [Issue 797](https://github.com/firefly-iii/firefly-iii/issues/797), reported by [leander091](https://github.com/leander091) +- [Issue 801](https://github.com/firefly-iii/firefly-iii/issues/801), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 803](https://github.com/firefly-iii/firefly-iii/issues/803), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 805](https://github.com/firefly-iii/firefly-iii/issues/805), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 806](https://github.com/firefly-iii/firefly-iii/issues/806), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 807](https://github.com/firefly-iii/firefly-iii/issues/807), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 808](https://github.com/firefly-iii/firefly-iii/issues/808), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 809](https://github.com/firefly-iii/firefly-iii/issues/809), reported by [pkoziol](https://github.com/pkoziol) +- [Issue 814](https://github.com/firefly-iii/firefly-iii/issues/814), reported by [nicoschreiner](https://github.com/nicoschreiner) +- [Issue 818](https://github.com/firefly-iii/firefly-iii/issues/818), reported by [gavu](https://github.com/gavu) +- [Issue 819](https://github.com/firefly-iii/firefly-iii/issues/819), reported by [DieBauer](https://github.com/DieBauer) +- [Issue 820](https://github.com/firefly-iii/firefly-iii/issues/820), reported by [simonsmiley](https://github.com/simonsmiley) - Various other fixes @@ -117,18 +117,18 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed -- [issue 717](https://github.com/firefly-iii/firefly-iii/issues/717), reported by [NiceGuyIT](https://github.com/NiceGuyIT) -- [issue 718](https://github.com/firefly-iii/firefly-iii/issues/718), reported by [wtercato](https://github.com/wtercato) -- [issue 722](https://github.com/firefly-iii/firefly-iii/issues/722), reported by [simonsmiley](https://github.com/simonsmiley) -- [issue 648](https://github.com/firefly-iii/firefly-iii/issues/648), reported by [skibbipl](https://github.com/skibbipl) -- [issue 730](https://github.com/firefly-iii/firefly-iii/issues/730), reported by [ragnarkarlsson](https://github.com/ragnarkarlsson) -- [issue 733](https://github.com/firefly-iii/firefly-iii/issues/733), reported by [xpfgsyb](https://github.com/xpfgsyb) -- [issue 735](https://github.com/firefly-iii/firefly-iii/issues/735), reported by [kristophr](https://github.com/kristophr) -- [issue 739](https://github.com/firefly-iii/firefly-iii/issues/739), reported by [skibbipl](https://github.com/skibbipl) -- [issue 515](https://github.com/firefly-iii/firefly-iii/issues/515), reported by [schwalberich](https://github.com/schwalberich) -- [issue 743](https://github.com/firefly-iii/firefly-iii/issues/743), reported by [simonsmiley](https://github.com/simonsmiley) -- [issue 746](https://github.com/firefly-iii/firefly-iii/issues/746), reported by [tannie](https://github.com/tannie) -- [issue 747](https://github.com/firefly-iii/firefly-iii/issues/747), reported by [tannie](https://github.com/tannie) +- [Issue 717](https://github.com/firefly-iii/firefly-iii/issues/717), reported by [NiceGuyIT](https://github.com/NiceGuyIT) +- [Issue 718](https://github.com/firefly-iii/firefly-iii/issues/718), reported by [wtercato](https://github.com/wtercato) +- [Issue 722](https://github.com/firefly-iii/firefly-iii/issues/722), reported by [simonsmiley](https://github.com/simonsmiley) +- [Issue 648](https://github.com/firefly-iii/firefly-iii/issues/648), reported by [skibbipl](https://github.com/skibbipl) +- [Issue 730](https://github.com/firefly-iii/firefly-iii/issues/730), reported by [ragnarkarlsson](https://github.com/ragnarkarlsson) +- [Issue 733](https://github.com/firefly-iii/firefly-iii/issues/733), reported by [xpfgsyb](https://github.com/xpfgsyb) +- [Issue 735](https://github.com/firefly-iii/firefly-iii/issues/735), reported by [kristophr](https://github.com/kristophr) +- [Issue 739](https://github.com/firefly-iii/firefly-iii/issues/739), reported by [skibbipl](https://github.com/skibbipl) +- [Issue 515](https://github.com/firefly-iii/firefly-iii/issues/515), reported by [schwalberich](https://github.com/schwalberich) +- [Issue 743](https://github.com/firefly-iii/firefly-iii/issues/743), reported by [simonsmiley](https://github.com/simonsmiley) +- [Issue 746](https://github.com/firefly-iii/firefly-iii/issues/746), reported by [tannie](https://github.com/tannie) +- [Issue 747](https://github.com/firefly-iii/firefly-iii/issues/747), reported by [tannie](https://github.com/tannie) ## [4.6.3.1] - 2017-07-23 @@ -176,8 +176,8 @@ This will be the last release to support PHP 7.0. - Revamped import routine. Will be buggy. ### Fixed -- [issue 667](https://github.com/firefly-iii/firefly-iii/issues/667), postgresql reported by [skibbipl](https://github.com/skibbipl). -- [issue 680](https://github.com/firefly-iii/firefly-iii/issues/680), fixed by [Xeli](https://github.com/Xeli) +- [Issue 667](https://github.com/firefly-iii/firefly-iii/issues/667), postgresql reported by [skibbipl](https://github.com/skibbipl). +- [Issue 680](https://github.com/firefly-iii/firefly-iii/issues/680), fixed by [Xeli](https://github.com/Xeli) - Fixed [issue 660](https://github.com/firefly-iii/firefly-iii/issues/660) - Fixes [issue 672](https://github.com/firefly-iii/firefly-iii/issues/672), reported by [dzaikos](https://github.com/dzaikos) - Fix a bug where the balance routine forgot to account for accounts without a currency preference. @@ -208,7 +208,7 @@ This will be the last release to support PHP 7.0. - The journal collector, an internal piece of code to collect transactions, now uses a slightly different method of collecting journals. This may cause problems. ### Fixed -- [issue 638](https://github.com/firefly-iii/firefly-iii/issues/638) as reported by [worldworm](https://github.com/worldworm). +- [Issue 638](https://github.com/firefly-iii/firefly-iii/issues/638) as reported by [worldworm](https://github.com/worldworm). - Possible fix for [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624) ## [4.4.2] - 2017-04-27 @@ -237,12 +237,12 @@ This will be the last release to support PHP 7.0. ### Added - Better overview / show pages. -- [issue 628](https://github.com/firefly-iii/firefly-iii/issues/628), as reported by [xzaz](https://github.com/xzaz). +- [Issue 628](https://github.com/firefly-iii/firefly-iii/issues/628), as reported by [xzaz](https://github.com/xzaz). - Greatly expanded test coverage ### Fixed -- [issue 619](https://github.com/firefly-iii/firefly-iii/issues/619), as reported by [dfiel](https://github.com/dfiel). -- [issue 620](https://github.com/firefly-iii/firefly-iii/issues/620), as reported by [forcaeluz](https://github.com/forcaeluz). +- [Issue 619](https://github.com/firefly-iii/firefly-iii/issues/619), as reported by [dfiel](https://github.com/dfiel). +- [Issue 620](https://github.com/firefly-iii/firefly-iii/issues/620), as reported by [forcaeluz](https://github.com/forcaeluz). - Attempt to fix [issue 624](https://github.com/firefly-iii/firefly-iii/issues/624), as reported by [TheSerenin](https://github.com/TheSerenin). - Favicon link is relative now, fixed by [welbert](https://github.com/welbert). - Some search bugs @@ -267,18 +267,18 @@ This will be the last release to support PHP 7.0. - Force key generation during installation. - The `date` function takes the fieldname where a date is stored, not the literal date by [Zsub](https://github.com/Zsub) - Improved budget frontpage chart, as suggested by [skibbipl](https://github.com/skibbipl) -- [issue 602](https://github.com/firefly-iii/firefly-iii/issues/602) and [issue 607](https://github.com/firefly-iii/firefly-iii/issues/607), as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos). -- [issue 605](https://github.com/firefly-iii/firefly-iii/issues/605), as reported by [Zsub](https://github.com/Zsub). -- [issue 599](https://github.com/firefly-iii/firefly-iii/issues/599), as reported by [leander091](https://github.com/leander091). -- [issue 610](https://github.com/firefly-iii/firefly-iii/issues/610), as reported by [skibbipl](https://github.com/skibbipl). -- [issue 611](https://github.com/firefly-iii/firefly-iii/issues/611), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). -- [issue 612](https://github.com/firefly-iii/firefly-iii/issues/612), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). -- [issue 614](https://github.com/firefly-iii/firefly-iii/issues/614), as reported by [worldworm](https://github.com/worldworm). +- [Issue 602](https://github.com/firefly-iii/firefly-iii/issues/602) and [issue 607](https://github.com/firefly-iii/firefly-iii/issues/607), as reported by [skibbipl](https://github.com/skibbipl) and [dzaikos](https://github.com/dzaikos). +- [Issue 605](https://github.com/firefly-iii/firefly-iii/issues/605), as reported by [Zsub](https://github.com/Zsub). +- [Issue 599](https://github.com/firefly-iii/firefly-iii/issues/599), as reported by [leander091](https://github.com/leander091). +- [Issue 610](https://github.com/firefly-iii/firefly-iii/issues/610), as reported by [skibbipl](https://github.com/skibbipl). +- [Issue 611](https://github.com/firefly-iii/firefly-iii/issues/611), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). +- [Issue 612](https://github.com/firefly-iii/firefly-iii/issues/612), as reported by [ragnarkarlsson](https://github.com/ragnarkarlsson). +- [Issue 614](https://github.com/firefly-iii/firefly-iii/issues/614), as reported by [worldworm](https://github.com/worldworm). - Various other bug fixes. ## [4.3.6] - 2017-02-20 ### Fixed -- [issue 578](https://github.com/firefly-iii/firefly-iii/issues/578), reported by [xpfgsyb](https://github.com/xpfgsyb). +- [Issue 578](https://github.com/firefly-iii/firefly-iii/issues/578), reported by [xpfgsyb](https://github.com/xpfgsyb). ## [4.3.5] - 2017-02-19 ### Added @@ -295,14 +295,14 @@ This will be the last release to support PHP 7.0. - Smooth curves, improved by [elamperti](https://github.com/elamperti). ### Fixed -- [issue 549](https://github.com/firefly-iii/firefly-iii/issues/549) -- [issue 553](https://github.com/firefly-iii/firefly-iii/issues/553) +- [Issue 549](https://github.com/firefly-iii/firefly-iii/issues/549) +- [Issue 553](https://github.com/firefly-iii/firefly-iii/issues/553) - Fixed [issue 559](https://github.com/firefly-iii/firefly-iii/issues/559) reported by [elamperti](https://github.com/elamperti). -- [issue 565](https://github.com/firefly-iii/firefly-iii/issues/565), as reported by a user over the mail -- [issue 566](https://github.com/firefly-iii/firefly-iii/issues/566), as reported by [dspeckmann](https://github.com/dspeckmann) -- [issue 567](https://github.com/firefly-iii/firefly-iii/issues/567), as reported by [winsomniak](https://github.com/winsomniak) -- [issue 569](https://github.com/firefly-iii/firefly-iii/issues/569), as reported by [winsomniak](https://github.com/winsomniak) -- [issue 572](https://github.com/firefly-iii/firefly-iii/issues/572), as reported by [zjean](https://github.com/zjean) +- [Issue 565](https://github.com/firefly-iii/firefly-iii/issues/565), as reported by a user over the mail +- [Issue 566](https://github.com/firefly-iii/firefly-iii/issues/566), as reported by [dspeckmann](https://github.com/dspeckmann) +- [Issue 567](https://github.com/firefly-iii/firefly-iii/issues/567), as reported by [winsomniak](https://github.com/winsomniak) +- [Issue 569](https://github.com/firefly-iii/firefly-iii/issues/569), as reported by [winsomniak](https://github.com/winsomniak) +- [Issue 572](https://github.com/firefly-iii/firefly-iii/issues/572), as reported by [zjean](https://github.com/zjean) - Many issues with the transaction filters which will fix reports (they tended to display the wrong amount). ## [4.3.4] - 2017-02-02 @@ -346,10 +346,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - The password reset routine was broken. -- [issue 522](https://github.com/firefly-iii/firefly-iii/issues/522), thanks to [xpfgsyb](https://github.com/xpfgsyb) -- [issue 524](https://github.com/firefly-iii/firefly-iii/issues/524), thanks to [worldworm](https://github.com/worldworm) -- [issue 526](https://github.com/firefly-iii/firefly-iii/issues/526), thanks to [worldworm](https://github.com/worldworm) -- [issue 528](https://github.com/firefly-iii/firefly-iii/issues/528), thanks to [skibbipl](https://github.com/skibbipl) +- [Issue 522](https://github.com/firefly-iii/firefly-iii/issues/522), thanks to [xpfgsyb](https://github.com/xpfgsyb) +- [Issue 524](https://github.com/firefly-iii/firefly-iii/issues/524), thanks to [worldworm](https://github.com/worldworm) +- [Issue 526](https://github.com/firefly-iii/firefly-iii/issues/526), thanks to [worldworm](https://github.com/worldworm) +- [Issue 528](https://github.com/firefly-iii/firefly-iii/issues/528), thanks to [skibbipl](https://github.com/skibbipl) - Various other fixes. ## [4.3.1] - 2017-01-04 @@ -363,18 +363,18 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Changed - **[New Github repository!](github.com/firefly-iii/firefly-iii)** - Better category overview. -- [issue 502](https://github.com/firefly-iii/firefly-iii/issues/502), thanks to [zjean](https://github.com/zjean) +- [Issue 502](https://github.com/firefly-iii/firefly-iii/issues/502), thanks to [zjean](https://github.com/zjean) ### Removed - Removed a lot of administration functions. - Removed ability to activate users. ### Fixed -- [issue 501](https://github.com/firefly-iii/firefly-iii/issues/501), thanks to [zjean](https://github.com/zjean) -- [issue 513](https://github.com/firefly-iii/firefly-iii/issues/513), thanks to [skibbipl](https://github.com/skibbipl) +- [Issue 501](https://github.com/firefly-iii/firefly-iii/issues/501), thanks to [zjean](https://github.com/zjean) +- [Issue 513](https://github.com/firefly-iii/firefly-iii/issues/513), thanks to [skibbipl](https://github.com/skibbipl) ### Security -- [issue 519](https://github.com/firefly-iii/firefly-iii/issues/519), thanks to [xpfgsyb](https://github.com/xpfgsyb) +- [Issue 519](https://github.com/firefly-iii/firefly-iii/issues/519), thanks to [xpfgsyb](https://github.com/xpfgsyb) ## [4.3.0] - 2016-12-26 ### Added @@ -407,7 +407,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Various bugs -- [issue 472](https://github.com/firefly-iii/firefly-iii/issues/472) thanks to [zjean](https://github.com/zjean) +- [Issue 472](https://github.com/firefly-iii/firefly-iii/issues/472) thanks to [zjean](https://github.com/zjean) ## [4.2.1] - 2016-12-09 ### Added @@ -433,11 +433,11 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Made some fonts local ### Fixed -- [issue 408](https://github.com/firefly-iii/firefly-iii/issues/408) +- [Issue 408](https://github.com/firefly-iii/firefly-iii/issues/408) - Various issues with split journals -- [issue 414](https://github.com/firefly-iii/firefly-iii/issues/414), thx [zjean](https://github.com/zjean) -- [issue 419](https://github.com/firefly-iii/firefly-iii/issues/419), thx [schwalberich](https://github.com/schwalberich) -- [issue 422](https://github.com/firefly-iii/firefly-iii/issues/422), thx [xzaz](https://github.com/xzaz) +- [Issue 414](https://github.com/firefly-iii/firefly-iii/issues/414), thx [zjean](https://github.com/zjean) +- [Issue 419](https://github.com/firefly-iii/firefly-iii/issues/419), thx [schwalberich](https://github.com/schwalberich) +- [Issue 422](https://github.com/firefly-iii/firefly-iii/issues/422), thx [xzaz](https://github.com/xzaz) - Various import bugs, such as [issue 416](https://github.com/firefly-iii/firefly-iii/issues/416) ([zjean](https://github.com/zjean)) ## [4.1.7] - 2016-11-19 @@ -473,9 +473,9 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Rebuilt seach engine. ### Fixed -- [issue 375](https://github.com/firefly-iii/firefly-iii/issues/375), thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies. -- [issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) thanks to [ksmolder](https://github.com/ksmolder) -- [issue 378](https://github.com/firefly-iii/firefly-iii/issues/378), thanks to [HomelessAvatar](https://github.com/HomelessAvatar) +- [Issue 375](https://github.com/firefly-iii/firefly-iii/issues/375), thanks to [schoentoon](https://github.com/schoentoon) which made it impossible to resurrect currencies. +- [Issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) thanks to [ksmolder](https://github.com/ksmolder) +- [Issue 378](https://github.com/firefly-iii/firefly-iii/issues/378), thanks to [HomelessAvatar](https://github.com/HomelessAvatar) ## [4.1.5] - 2016-11-01 ### Changed @@ -484,7 +484,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Help content is translated through Crowdin. ### Fixed -- [issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) +- [Issue 370](https://github.com/firefly-iii/firefly-iii/issues/370) ## [4.1.4] - 2016-10-30 ### Added @@ -501,10 +501,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Change error message to refer to solution. ### Fixed -- [issue 367](https://github.com/firefly-iii/firefly-iii/issues/367) thanks to [HungryFeline](https://github.com/HungryFeline) -- [issue 366](https://github.com/firefly-iii/firefly-iii/issues/366) thanks to [3mz3t](https://github.com/3mz3t) -- [issue 362](https://github.com/firefly-iii/firefly-iii/issues/362) and [issue 341](https://github.com/firefly-iii/firefly-iii/issues/341) thanks to [bnw](https://github.com/bnw) -- [issue 355](https://github.com/firefly-iii/firefly-iii/issues/355) thanks to [roberthorlings](https://github.com/roberthorlings) +- [Issue 367](https://github.com/firefly-iii/firefly-iii/issues/367) thanks to [HungryFeline](https://github.com/HungryFeline) +- [Issue 366](https://github.com/firefly-iii/firefly-iii/issues/366) thanks to [3mz3t](https://github.com/3mz3t) +- [Issue 362](https://github.com/firefly-iii/firefly-iii/issues/362) and [issue 341](https://github.com/firefly-iii/firefly-iii/issues/341) thanks to [bnw](https://github.com/bnw) +- [Issue 355](https://github.com/firefly-iii/firefly-iii/issues/355) thanks to [roberthorlings](https://github.com/roberthorlings) ## [4.1.3] - 2016-10-22 ### Fixed @@ -535,7 +535,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Lots of old code ### Fixed -- [issue 357](https://github.com/firefly-iii/firefly-iii/issues/357), where non utf-8 files would break Firefly. +- [Issue 357](https://github.com/firefly-iii/firefly-iii/issues/357), where non utf-8 files would break Firefly. - Tab delimiter is not properly loaded from import configuration ([roberthorlings](https://github.com/roberthorlings)) - System response to yearly bills @@ -548,7 +548,7 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Updated all copyright notices to refer to the [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/) - Fixed [issue 344](https://github.com/firefly-iii/firefly-iii/issues/344) - Fixed [issue 346](https://github.com/firefly-iii/firefly-iii/issues/346), thanks to [SanderKleykens](https://github.com/SanderKleykens) -- [issue 351](https://github.com/firefly-iii/firefly-iii/issues/351) +- [Issue 351](https://github.com/firefly-iii/firefly-iii/issues/351) - Did some internal remodelling. ### Fixed @@ -564,10 +564,10 @@ An intermediate release because something in the Twig and Twigbridge libraries i ### Fixed - Fixed a bug where incoming transactions would not be properly filtered in several reports. -- [issue 334](https://github.com/firefly-iii/firefly-iii/issues/334) by [cyberkov](https://github.com/cyberkov) -- [issue 337](https://github.com/firefly-iii/firefly-iii/issues/337) -- [issue 336](https://github.com/firefly-iii/firefly-iii/issues/336) -- [issue 338](https://github.com/firefly-iii/firefly-iii/issues/338) found by [roberthorlings](https://github.com/roberthorlings) +- [Issue 334](https://github.com/firefly-iii/firefly-iii/issues/334) by [cyberkov](https://github.com/cyberkov) +- [Issue 337](https://github.com/firefly-iii/firefly-iii/issues/337) +- [Issue 336](https://github.com/firefly-iii/firefly-iii/issues/336) +- [Issue 338](https://github.com/firefly-iii/firefly-iii/issues/338) found by [roberthorlings](https://github.com/roberthorlings) ## [4.0.0] - 2016-09-26 ### Added @@ -662,11 +662,11 @@ An intermediate release because something in the Twig and Twigbridge libraries i - Rewrote all migrations. [issue 272](https://github.com/firefly-iii/firefly-iii/issues/272) ### Fixed -- [issue 264](https://github.com/firefly-iii/firefly-iii/issues/264) -- [issue 265](https://github.com/firefly-iii/firefly-iii/issues/265) +- [Issue 264](https://github.com/firefly-iii/firefly-iii/issues/264) +- [Issue 265](https://github.com/firefly-iii/firefly-iii/issues/265) - Fixed amount calculation problems, [issue 266](https://github.com/firefly-iii/firefly-iii/issues/266), thanks [xzaz](https://github.com/xzaz) -- [issue 271](https://github.com/firefly-iii/firefly-iii/issues/271) -- [issue 278](https://github.com/firefly-iii/firefly-iii/issues/278), [issue 273](https://github.com/firefly-iii/firefly-iii/issues/273), thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella) +- [Issue 271](https://github.com/firefly-iii/firefly-iii/issues/271) +- [Issue 278](https://github.com/firefly-iii/firefly-iii/issues/278), [issue 273](https://github.com/firefly-iii/firefly-iii/issues/273), thanks [StevenReitsma](https://github.com/StevenReitsma) and [rubella](https://github.com/rubella) - Bug in attachment download routine would report the wrong size to the user's browser. - Various NULL errors fixed. - Various strict typing errors fixed. From c6c76ac710b467b45523f4bffba986367d9f784b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 08:30:32 +0200 Subject: [PATCH 46/49] New lock file --- composer.lock | 753 +++++++++++++++++++++++++------------------------- 1 file changed, 378 insertions(+), 375 deletions(-) diff --git a/composer.lock b/composer.lock index c6e877fe0b..4ca5b1dc02 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "deb789ede19ed07dba82e844171ae0e2", + "content-hash": "5f0b147d78d1f5e10c11c78621f31908", "packages": [ { "name": "bacon/bacon-qr-code", @@ -782,102 +782,6 @@ ], "time": "2017-06-15T17:19:42+00:00" }, - { - "name": "guzzle/guzzle", - "version": "v3.9.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "abandoned": "guzzlehttp/guzzle", - "time": "2015-03-18T18:23:50+00:00" - }, { "name": "laravel/framework", "version": "v5.5.14", @@ -1507,64 +1411,6 @@ ], "time": "2017-09-27T21:40:39+00:00" }, - { - "name": "php-coveralls/php-coveralls", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-coveralls/php-coveralls.git", - "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/da51d304fe8622bf9a6da39a8446e7afd432115c", - "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-simplexml": "*", - "guzzle/guzzle": "^2.8|^3.0", - "php": ">=5.3.3", - "psr/log": "^1.0", - "symfony/config": "^2.1|^3.0", - "symfony/console": "^2.1|^3.0", - "symfony/stopwatch": "^2.0|^3.0", - "symfony/yaml": "^2.0|^3.0" - }, - "suggest": { - "symfony/http-kernel": "Allows Symfony integration" - }, - "bin": [ - "bin/coveralls" - ], - "type": "library", - "autoload": { - "psr-4": { - "Satooshi\\": "src/Satooshi/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" - } - ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/satooshi/php-coveralls", - "keywords": [ - "ci", - "coverage", - "github", - "test" - ], - "time": "2016-01-20T17:35:46+00:00" - }, { "name": "pragmarx/google2fa", "version": "v1.0.1", @@ -2020,68 +1866,6 @@ ], "time": "2017-09-30T22:39:41+00:00" }, - { - "name": "symfony/config", - "version": "v3.3.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd", - "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0" - }, - "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" - }, - "require-dev": { - "symfony/dependency-injection": "~3.3", - "symfony/finder": "~3.3", - "symfony/yaml": "~3.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Config\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Config Component", - "homepage": "https://symfony.com", - "time": "2017-10-04T18:56:58+00:00" - }, { "name": "symfony/console", "version": "v3.3.10", @@ -2319,55 +2103,6 @@ "homepage": "https://symfony.com", "time": "2017-10-01T21:00:16+00:00" }, - { - "name": "symfony/filesystem", - "version": "v3.3.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1", - "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Filesystem Component", - "homepage": "https://symfony.com", - "time": "2017-10-03T13:33:10+00:00" - }, { "name": "symfony/finder", "version": "v3.3.10", @@ -2849,55 +2584,6 @@ ], "time": "2017-10-02T07:25:00+00:00" }, - { - "name": "symfony/stopwatch", - "version": "v3.3.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "170edf8b3247d7b6779eb6fa7428f342702ca184" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/170edf8b3247d7b6779eb6fa7428f342702ca184", - "reference": "170edf8b3247d7b6779eb6fa7428f342702ca184", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2017-10-02T06:42:24+00:00" - }, { "name": "symfony/translation", "version": "v3.3.10", @@ -3031,61 +2717,6 @@ ], "time": "2017-10-02T06:42:24+00:00" }, - { - "name": "symfony/yaml", - "version": "v3.3.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", - "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "require-dev": { - "symfony/console": "~2.8|~3.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2017-10-05T14:43:42+00:00" - }, { "name": "tijsverkoyen/css-to-inline-styles", "version": "2.2.0", @@ -3632,6 +3263,102 @@ ], "time": "2017-08-15T16:48:10+00:00" }, + { + "name": "guzzle/guzzle", + "version": "v3.9.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" + }, + "suggest": { + "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.9-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "abandoned": "guzzlehttp/guzzle", + "time": "2015-03-18T18:23:50+00:00" + }, { "name": "hamcrest/hamcrest-php", "version": "v1.2.2", @@ -3947,6 +3674,67 @@ "description": "Library for handling version information and constraints", "time": "2017-03-05T17:38:23+00:00" }, + { + "name": "php-coveralls/php-coveralls", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-coveralls/php-coveralls.git", + "reference": "9c07b63acbc9709344948b6fd4f63a32b2ef4127" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/9c07b63acbc9709344948b6fd4f63a32b2ef4127", + "reference": "9c07b63acbc9709344948b6fd4f63a32b2ef4127", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-simplexml": "*", + "guzzle/guzzle": "^2.8 || ^3.0", + "php": "^5.3.3 || ^7.0", + "psr/log": "^1.0", + "symfony/config": "^2.1 || ^3.0 || ^4.0", + "symfony/console": "^2.1 || ^3.0 || ^4.0", + "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0", + "symfony/yaml": "^2.0 || ^3.0 || ^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0" + }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, + "bin": [ + "bin/coveralls" + ], + "type": "library", + "autoload": { + "psr-4": { + "Satooshi\\": "src/Satooshi/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/php-coveralls/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "time": "2017-10-14T23:15:34+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", @@ -4408,16 +4196,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.4.1", + "version": "6.4.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b770d8ba7e60295ee91d69d5a5e01ae833cac220" + "reference": "ae6e2e062ff55263c7b04374c190aca45872b26a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b770d8ba7e60295ee91d69d5a5e01ae833cac220", - "reference": "b770d8ba7e60295ee91d69d5a5e01ae833cac220", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6e2e062ff55263c7b04374c190aca45872b26a", + "reference": "ae6e2e062ff55263c7b04374c190aca45872b26a", "shasum": "" }, "require": { @@ -4488,7 +4276,7 @@ "testing", "xunit" ], - "time": "2017-10-07T17:53:53+00:00" + "time": "2017-10-15T06:16:19+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -5164,6 +4952,221 @@ "homepage": "https://symfony.com", "time": "2017-10-02T06:42:24+00:00" }, + { + "name": "symfony/config", + "version": "v3.3.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/4ab62407bff9cd97c410a7feaef04c375aaa5cfd", + "reference": "4ab62407bff9cd97c410a7feaef04c375aaa5cfd", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "symfony/filesystem": "~2.8|~3.0" + }, + "conflict": { + "symfony/dependency-injection": "<3.3", + "symfony/finder": "<3.3" + }, + "require-dev": { + "symfony/dependency-injection": "~3.3", + "symfony/finder": "~3.3", + "symfony/yaml": "~3.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "https://symfony.com", + "time": "2017-10-04T18:56:58+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v3.3.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/90bc45abf02ae6b7deb43895c1052cb0038506f1", + "reference": "90bc45abf02ae6b7deb43895c1052cb0038506f1", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Filesystem Component", + "homepage": "https://symfony.com", + "time": "2017-10-03T13:33:10+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v3.3.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "170edf8b3247d7b6779eb6fa7428f342702ca184" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/170edf8b3247d7b6779eb6fa7428f342702ca184", + "reference": "170edf8b3247d7b6779eb6fa7428f342702ca184", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2017-10-02T06:42:24+00:00" + }, + { + "name": "symfony/yaml", + "version": "v3.3.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", + "reference": "8c7bf1e7d5d6b05a690b715729cb4cd0c0a99c46", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2017-10-05T14:43:42+00:00" + }, { "name": "theseer/tokenizer", "version": "1.1.0", From 6fedf1eec035c92b78f03f97041835a508f6a5ea Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 08:44:16 +0200 Subject: [PATCH 47/49] Fixed tests --- tests/Feature/Controllers/BudgetControllerTest.php | 7 ++----- tests/Feature/Controllers/Chart/BudgetControllerTest.php | 6 ------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index 5db4645cd2..ea45bcbf0d 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -297,7 +297,6 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $date = new Carbon(); @@ -332,7 +331,6 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getJournals')->andReturn(new Collection); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); @@ -369,7 +367,6 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); $date = new Carbon(); @@ -422,8 +419,8 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); @@ -488,7 +485,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index a0235b978d..6b2eb15417 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -104,18 +104,13 @@ class BudgetControllerTest extends TestCase { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); - $accountRepos = $this->mock(AccountRepositoryInterface::class); $transactions = factory(Transaction::class, 10)->make(); - $accounts = factory(Account::class, 10)->make(); $collector->shouldReceive('setAllAssetAccounts')->once()->andReturnSelf(); - $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->once()->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('getJournals')->andReturn($transactions); - $accountRepos->shouldReceive('getAccountsByType')->andReturn($accounts)->once(); - $generator->shouldReceive('pieChart')->once()->andReturn([]); $this->be($this->user()); @@ -141,7 +136,6 @@ class BudgetControllerTest extends TestCase $categories = factory(Category::class, 10)->make(); $collector->shouldReceive('setAllAssetAccounts')->once()->andReturnSelf(); - $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->once()->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); From b28c3a64fa9a536575a5d033c27b60ac0e80d4c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 08:45:12 +0200 Subject: [PATCH 48/49] Updated version. --- config/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/firefly.php b/config/firefly.php index 1c26cbf037..994157de51 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -23,7 +23,7 @@ return [ 'is_demo_site' => false, ], 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), - 'version' => '4.6.7', + 'version' => '4.6.8', 'maxUploadSize' => 15242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], 'list_length' => 10, From 7ff19a8419e5f22b6a4381470b5703e2d9e2ab4c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 15 Oct 2017 08:52:36 +0200 Subject: [PATCH 49/49] Updated changelog. --- CHANGELOG.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 757aadb090..56033132f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.6.8] - 2017-10-15 +### Added +- Verify routine will check if deposits have a budget (they shouldn't). +- New translations! + +### Changed +- Changed docker files for [issue 919](https://github.com/firefly-iii/firefly-iii/issues/919) and [issue 915](https://github.com/firefly-iii/firefly-iii/issues/915) + +### Fixed +- [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), as reported by [Wr0ngName](https://github.com/Wr0ngName) +- Rules can no longer set a budget for a transfer or a deposit ([issue 916](https://github.com/firefly-iii/firefly-iii/issues/916)) +- Fixed [issue 925](https://github.com/firefly-iii/firefly-iii/issues/925), [issue 928](https://github.com/firefly-iii/firefly-iii/issues/928) as reported by [dzaikos](https://github.com/dzaikos) and [DeltaKiloz](https://github.com/DeltaKiloz) +- A fix for [issue 926](https://github.com/firefly-iii/firefly-iii/issues/926), as reported by [Aquariu](https://github.com/Aquariu) + ## [4.6.7] - 2017-10-09 ### Added - [Issue 872](https://github.com/firefly-iii/firefly-iii/issues/872), reported [gavu](https://github.com/gavu) @@ -19,7 +33,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - [Issue 904](https://github.com/firefly-iii/firefly-iii/issues/904), reported by [gavu](https://github.com/gavu) - [Issue 910](https://github.com/firefly-iii/firefly-iii/issues/910), reported by [gavu](https://github.com/gavu) - [Issue 911](https://github.com/firefly-iii/firefly-iii/issues/911), reported by [gavu](https://github.com/gavu) -- [Issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by @TomWis97 +- [Issue 915](https://github.com/firefly-iii/firefly-iii/issues/915), reported by [TomWis97](https://github.com/TomWis97) - [Issue 917](https://github.com/firefly-iii/firefly-iii/issues/917), reported by [Wr0ngName](https://github.com/Wr0ngName) ## [4.6.6] - 2017-09-30