From de533e7031ae194b35f6a638cd95f5c94c516796 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Mon, 14 Oct 2019 12:30:11 +0200
Subject: [PATCH] Kimai 1.4.2 (#1167)

---
 CHANGELOG.md                              | 6 ++++++
 UPGRADING.md                              | 2 +-
 public/index.php                          | 2 +-
 src/Constants.php                         | 2 +-
 src/DependencyInjection/Configuration.php | 3 ++-
 templates/export/index.html.twig          | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d93ea2a..b74d46ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.4.2](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-14)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4.1...1.4.2)
+
+## [1.4.1](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-07)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4...1.4.1)
+
 ## [1.4](https://github.com/kevinpapst/kimai2/tree/1.4) (2019-10-03)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.3...1.4)
 
diff --git a/UPGRADING.md b/UPGRADING.md
index 4ebf794c..70a68934 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -43,7 +43,7 @@ New permission (used in new dashboard widget):
 - Maximum activity name length lowered to 150 character
 - Added new permission: `manage_invoice_template`
   - Removed permissions: `view_invoice_template`, `create_invoice_template`, `edit_invoice_template`, `delete_invoice_template`
-- Removed permission: `create_export` (using `create_export` only)
+- Removed permission: `view_export` (using `create_export` only)
 - Custom export renderer need to check for usage of `Timesheet::getEnd()` as running entries can now be exported as well
 
 ## [1.1](https://github.com/kevinpapst/kimai2/releases/tag/1.1)
diff --git a/public/index.php b/public/index.php
index 1c82bc16..fd7a6f44 100644
--- a/public/index.php
+++ b/public/index.php
@@ -15,7 +15,7 @@ if (!isset($_SERVER['APP_ENV'])) {
     (new Dotenv(true))->load(__DIR__.'/../.env');
 }
 
-$env = $_SERVER['APP_ENV'] ?? 'dev';
+$env = $_SERVER['APP_ENV'] ?? 'prod';
 $debug = $_SERVER['APP_DEBUG'] ?? ('prod' !== $env);
 
 if ($debug) {
diff --git a/src/Constants.php b/src/Constants.php
index f2022681..709ed907 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -17,7 +17,7 @@ class Constants
     /**
      * The current release version
      */
-    public const VERSION = '1.4';
+    public const VERSION = '1.4.2';
     /**
      * The current release status, either "stable" or "dev"
      */
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index f4ac4e33..bb321efb 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -13,6 +13,7 @@ use App\Entity\Customer;
 use App\Entity\User;
 use App\Timesheet\Rounding\RoundingInterface;
 use App\Widget\Type\CompoundRow;
+use App\Widget\Type\Counter;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -416,7 +417,7 @@ class Configuration implements ConfigurationInterface
                     ->scalarNode('end')->end()
                     ->scalarNode('icon')->defaultValue('')->end()
                     ->scalarNode('color')->defaultValue('')->end()
-                    ->scalarNode('type')->defaultValue('counter')->end()
+                    ->scalarNode('type')->defaultValue(Counter::class)->end()
                 ->end()
             ->end()
         ;
diff --git a/templates/export/index.html.twig b/templates/export/index.html.twig
index fb6ad249..740d77d3 100644
--- a/templates/export/index.html.twig
+++ b/templates/export/index.html.twig
@@ -49,7 +49,7 @@
                     </button>
                 {% endfor %}
             </div>
-            {{ form_widget(form.preview, {'attr': {'data-toggle': 'tooltip', 'title': 'limited_entries'|trans({'%max%': preview_max})}}) }}
+            {{ form_widget(form.preview) }}
         {% endblock %}
         {% block box_after %}{{ form_end(form) }}{% endblock %}
     {% endembed %}