From 7ef8ff60a5e162e106190b165fdc79cc30edef08 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 2 Mar 2017 19:41:17 +0100 Subject: [PATCH] Update config files. --- CHANGELOG.md | 24 +++++++++++ config/firefly.php | 7 +-- resources/views/auth/confirmation/error.twig | 43 ------------------- .../views/auth/confirmation/no-resent.twig | 43 ------------------- resources/views/auth/confirmation/resent.twig | 43 ------------------- 5 files changed, 25 insertions(+), 135 deletions(-) delete mode 100644 resources/views/auth/confirmation/error.twig delete mode 100644 resources/views/auth/confirmation/no-resent.twig delete mode 100644 resources/views/auth/confirmation/resent.twig diff --git a/CHANGELOG.md b/CHANGELOG.md index 81697a14cb..7758126fe2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.3.7] - 2017-03-05 +### Added +- Nice user friendly views for empty lists. +- Extended contribution guidelines. +- First version of financial report filtered on tags. +- Suggested monthly savings for piggy banks, by [Zsub](https://github.com/Zsub) + +### Changed +- Slightly changed tag overview. +- Consistent icon for bill in list. +- Slightly changed account overview. + +### Removed +- Removed IDE specific views from .gitignore, issue #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). +- Various other bug fixes. + ## [4.3.6] - 2017-02-20 ### Fixed - #578, reported by [xpfgsyb](https://github.com/xpfgsyb). diff --git a/config/firefly.php b/config/firefly.php index 043b94c7c0..48edf214cb 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -23,15 +23,10 @@ return [ 'is_demo_site' => false, ], 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), - 'chart' => 'chartjs', - 'version' => '4.3.6', - 'csv_import_enabled' => true, + 'version' => '4.3.7', 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], - 'resend_confirmation' => 3600, - 'confirmation_age' => 14400, // four hours 'list_length' => 10, - 'export_formats' => [ 'csv' => 'FireflyIII\Export\Exporter\CsvExporter', ], diff --git a/resources/views/auth/confirmation/error.twig b/resources/views/auth/confirmation/error.twig deleted file mode 100644 index a417e4db7b..0000000000 --- a/resources/views/auth/confirmation/error.twig +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Firefly III - - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - - -
- - -
-
-

{{ 'confirm_account_header'|_ }}

-
-
- -
-
-

- {{ 'confirm_account_intro'|_ }} -

-

- {{ 'confirm_account_resend_email'|_ }} -

-
-
-
- - diff --git a/resources/views/auth/confirmation/no-resent.twig b/resources/views/auth/confirmation/no-resent.twig deleted file mode 100644 index 64c24e95e0..0000000000 --- a/resources/views/auth/confirmation/no-resent.twig +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Firefly III - - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - - -
- - -
-
-

{{ 'confirm_account_not_resent_header'|_ }}

-
-
- -
-
-

- {{ trans('firefly.confirm_account_not_resent_intro', {owner:owner})|raw }} -

-

- {{ 'confirm_account_not_resent_go_home'|_ }} -

-
-
-
- - diff --git a/resources/views/auth/confirmation/resent.twig b/resources/views/auth/confirmation/resent.twig deleted file mode 100644 index accae395df..0000000000 --- a/resources/views/auth/confirmation/resent.twig +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Firefly III - - - - - - - - - {# favicons #} - {% include('partials.favicons') %} - - - -
- - -
-
-

{{ 'confirm_account_is_resent_header'|_ }}

-
-
- -
-
-

- {{ trans('firefly.confirm_account_is_resent_text', {owner:owner})|raw }} -

-

- {{ 'confirm_account_is_resent_go_home'|_ }} -

-
-
-
- -