Merge branch 'release/3.10.3' into develop

2025-02-25 18:45:27 -06:00 · 2016-09-11 08:17:42 +02:00 · 2016-09-11 08:17:42 +02:00 · 11b6b5a63c
commit 11b6b5a63c
parent e4fef6dfc3 2920dd356e
21 changed files with 47 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 - No unreleased changes yet.

+## [3.10.3] - 2016-08-29
+### Added
+- More fields for mass-edit, thanks to @Vissert (#282)
+- First start of German translation
+
+### Changed
+- More optional fields for transactions and the ability to filter them.
+
+### Removed
+- Preference for budget maximum.
+
+### Fixed
+- A bug in the translation routine broke the import.
+- It was possible to destroy your Firefly installation by removing all currencies. Thanks @mondjef
+- Translation bugs.
+- Import bug.
+
+### Security
+- Firefly will not accept registrations beyond the first one, by default.
+
+
 ## [3.10.2] - 2016-08-29
 ### Added
 - New Chinese translations. Set Firefly III to show incomplete translations to follow the progress. Want to translate Firefly III in Chinese, or in any other language? Then check out [the Crowdin project](https://crowdin.com/project/firefly-iii).
--- a/config/firefly.php
+++ b/config/firefly.php
@ -10,7 +10,7 @@ return [
    ],

    'chart'               => 'chartjs',
-    'version'             => '3.10.2',
+    'version'             => '3.10.3',
    'csv_import_enabled'  => true,
    'maxUploadSize'       => 5242880,
    'allowedMimes'        => ['image/png', 'image/jpeg', 'application/pdf'],
--- a/config/upgrade.php
+++ b/config/upgrade.php
@ -30,5 +30,6 @@ return [
        '3.10'    => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10',
        '3.10.1'  => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10',
        '3.10.2'  => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10',
+        '3.10.3'  => 'Please find the full upgrade instructions here: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.10',
    ],
 ];
--- a/resources/lang/de_DE/firefly.php
+++ b/resources/lang/de_DE/firefly.php
@ -285,6 +285,7 @@ return [
    'pref_optional_tj_process_date'             => 'Processing date',
    'pref_optional_tj_due_date'                 => 'Due date',
    'pref_optional_tj_payment_date'             => 'Payment date',
+    'pref_optional_tj_invoice_date'             => 'Invoice date',
    'pref_optional_tj_internal_reference'       => 'Internal reference',
    'pref_optional_tj_notes'                    => 'Notes',
    'pref_optional_tj_attachments'              => 'Attachments',
--- a/resources/lang/de_DE/form.php
+++ b/resources/lang/de_DE/form.php
@ -149,5 +149,6 @@ return [

    'due_date'           => 'Due date',
    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
    'internal_reference' => 'Internal reference',
 ];
--- a/resources/lang/de_DE/list.php
+++ b/resources/lang/de_DE/list.php
@ -41,6 +41,8 @@ return [
    'process_date'          => 'Processing date',
    'due_date'              => 'Due date',
    'payment_date'          => 'Payment date',
+    'invoice_date'          => 'Invoice date',
+    'interal_reference'     => 'Internal reference',
    'notes'                 => 'Notes',
    'from'                  => 'From',
    'piggy_bank'            => 'Sparschwein',
--- a/resources/lang/fr_FR/firefly.php
+++ b/resources/lang/fr_FR/firefly.php
@ -285,6 +285,7 @@ return [
    'pref_optional_tj_process_date'             => 'Processing date',
    'pref_optional_tj_due_date'                 => 'Due date',
    'pref_optional_tj_payment_date'             => 'Payment date',
+    'pref_optional_tj_invoice_date'             => 'Invoice date',
    'pref_optional_tj_internal_reference'       => 'Internal reference',
    'pref_optional_tj_notes'                    => 'Notes',
    'pref_optional_tj_attachments'              => 'Attachments',
--- a/resources/lang/fr_FR/form.php
+++ b/resources/lang/fr_FR/form.php
@ -149,5 +149,6 @@ return [

    'due_date'           => 'Due date',
    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
    'internal_reference' => 'Internal reference',
 ];
--- a/resources/lang/fr_FR/list.php
+++ b/resources/lang/fr_FR/list.php
@ -41,6 +41,8 @@ return [
    'process_date'          => 'Date de traitement',
    'due_date'              => 'Due date',
    'payment_date'          => 'Payment date',
+    'invoice_date'          => 'Invoice date',
+    'interal_reference'     => 'Internal reference',
    'notes'                 => 'Notes',
    'from'                  => 'Depuis',
    'piggy_bank'            => 'Tirelire',
--- a/resources/lang/nl_NL/firefly.php
+++ b/resources/lang/nl_NL/firefly.php
@ -285,6 +285,7 @@ return [
    'pref_optional_tj_process_date'             => 'Verwerkingsdatum',
    'pref_optional_tj_due_date'                 => 'Vervaldatum',
    'pref_optional_tj_payment_date'             => 'Betalingsdatum',
+    'pref_optional_tj_invoice_date'             => 'Factuurdatum',
    'pref_optional_tj_internal_reference'       => 'Interne verwijzing',
    'pref_optional_tj_notes'                    => 'Notities',
    'pref_optional_tj_attachments'              => 'Bijlagen',
--- a/resources/lang/nl_NL/form.php
+++ b/resources/lang/nl_NL/form.php
@ -149,5 +149,6 @@ return [

    'due_date'           => 'Vervaldatum',
    'payment_date'       => 'Betalingsdatum',
+    'invoice_date'       => 'Factuurdatum',
    'internal_reference' => 'Interne verwijzing',
 ];
--- a/resources/lang/nl_NL/list.php
+++ b/resources/lang/nl_NL/list.php
@ -41,6 +41,8 @@ return [
    'process_date'          => 'Verwerkingsdatum',
    'due_date'              => 'Vervaldatum',
    'payment_date'          => 'Betalingsdatum',
+    'invoice_date'          => 'Factuurdatum',
+    'interal_reference'     => 'Interne verwijzing',
    'notes'                 => 'Notities',
    'from'                  => 'Van',
    'piggy_bank'            => 'Spaarpotje',
--- a/resources/lang/pt_BR/firefly.php
+++ b/resources/lang/pt_BR/firefly.php
@ -285,6 +285,7 @@ return [
    'pref_optional_tj_process_date'             => 'Processing date',
    'pref_optional_tj_due_date'                 => 'Due date',
    'pref_optional_tj_payment_date'             => 'Payment date',
+    'pref_optional_tj_invoice_date'             => 'Invoice date',
    'pref_optional_tj_internal_reference'       => 'Internal reference',
    'pref_optional_tj_notes'                    => 'Notes',
    'pref_optional_tj_attachments'              => 'Attachments',
--- a/resources/lang/pt_BR/form.php
+++ b/resources/lang/pt_BR/form.php
@ -149,5 +149,6 @@ return [

    'due_date'           => 'Due date',
    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
    'internal_reference' => 'Internal reference',
 ];
--- a/resources/lang/pt_BR/list.php
+++ b/resources/lang/pt_BR/list.php
@ -41,6 +41,8 @@ return [
    'process_date'          => 'Data de processamento',
    'due_date'              => 'Due date',
    'payment_date'          => 'Payment date',
+    'invoice_date'          => 'Invoice date',
+    'interal_reference'     => 'Internal reference',
    'notes'                 => 'Notes',
    'from'                  => 'De',
    'piggy_bank'            => 'Cofrinho',
--- a/resources/lang/zh-HK/firefly.php
+++ b/resources/lang/zh-HK/firefly.php
@ -285,6 +285,7 @@ return [
    'pref_optional_tj_process_date'             => 'Processing date',
    'pref_optional_tj_due_date'                 => 'Due date',
    'pref_optional_tj_payment_date'             => 'Payment date',
+    'pref_optional_tj_invoice_date'             => 'Invoice date',
    'pref_optional_tj_internal_reference'       => 'Internal reference',
    'pref_optional_tj_notes'                    => 'Notes',
    'pref_optional_tj_attachments'              => 'Attachments',
--- a/resources/lang/zh-HK/form.php
+++ b/resources/lang/zh-HK/form.php
@ -149,5 +149,6 @@ return [

    'due_date'           => 'Due date',
    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
    'internal_reference' => 'Internal reference',
 ];
--- a/resources/lang/zh-HK/list.php
+++ b/resources/lang/zh-HK/list.php
@ -41,6 +41,8 @@ return [
    'process_date'          => 'Processing date',
    'due_date'              => 'Due date',
    'payment_date'          => 'Payment date',
+    'invoice_date'          => 'Invoice date',
+    'interal_reference'     => 'Internal reference',
    'notes'                 => 'Notes',
    'from'                  => 'From',
    'piggy_bank'            => 'Piggy bank',
--- a/resources/lang/zh-TW/firefly.php
+++ b/resources/lang/zh-TW/firefly.php
@ -285,6 +285,7 @@ return [
    'pref_optional_tj_process_date'             => 'Processing date',
    'pref_optional_tj_due_date'                 => 'Due date',
    'pref_optional_tj_payment_date'             => 'Payment date',
+    'pref_optional_tj_invoice_date'             => 'Invoice date',
    'pref_optional_tj_internal_reference'       => 'Internal reference',
    'pref_optional_tj_notes'                    => 'Notes',
    'pref_optional_tj_attachments'              => 'Attachments',
--- a/resources/lang/zh-TW/form.php
+++ b/resources/lang/zh-TW/form.php
@ -149,5 +149,6 @@ return [

    'due_date'           => 'Due date',
    'payment_date'       => 'Payment date',
+    'invoice_date'       => 'Invoice date',
    'internal_reference' => 'Internal reference',
 ];
--- a/resources/lang/zh-TW/list.php
+++ b/resources/lang/zh-TW/list.php
@ -41,6 +41,8 @@ return [
    'process_date'          => '處理日期',
    'due_date'              => 'Due date',
    'payment_date'          => 'Payment date',
+    'invoice_date'          => 'Invoice date',
+    'interal_reference'     => 'Internal reference',
    'notes'                 => 'Notes',
    'from'                  => '從',
    'piggy_bank'            => '存錢筒',