jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Kimai 1.4.2 (#1167)

Browse Source
This commit is contained in:
Kevin Papst
2019-10-14 12:30:11 +02:00
committed by GitHub
parent ae6ed3f23f
commit de533e7031
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,5 +1,11 @@
# Change Log # 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) ## [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) [Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.3...1.4)

2
UPGRADING.md
View File

@@ -43,7 +43,7 @@ New permission (used in new dashboard widget):
- Maximum activity name length lowered to 150 character - Maximum activity name length lowered to 150 character
- Added new permission: `manage_invoice_template` - Added new permission: `manage_invoice_template`
- Removed permissions: `view_invoice_template`, `create_invoice_template`, `edit_invoice_template`, `delete_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 - 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) ## [1.1](https://github.com/kevinpapst/kimai2/releases/tag/1.1)

2
public/index.php
View File

@@ -15,7 +15,7 @@ if (!isset($_SERVER['APP_ENV'])) {
(new Dotenv(true))->load(__DIR__.'/../.env'); (new Dotenv(true))->load(__DIR__.'/../.env');
} }
$env = $_SERVER['APP_ENV'] ?? 'dev'; $env = $_SERVER['APP_ENV'] ?? 'prod';
$debug = $_SERVER['APP_DEBUG'] ?? ('prod' !== $env); $debug = $_SERVER['APP_DEBUG'] ?? ('prod' !== $env);
if ($debug) { if ($debug) {

2
src/Constants.php
View File

@@ -17,7 +17,7 @@ class Constants
/** /**
* The current release version * The current release version
*/ */
public const VERSION = '1.4'; public const VERSION = '1.4.2';
/** /**
* The current release status, either "stable" or "dev" * The current release status, either "stable" or "dev"
*/ */

3
src/DependencyInjection/Configuration.php
View File

@@ -13,6 +13,7 @@ use App\Entity\Customer;
use App\Entity\User; use App\Entity\User;
use App\Timesheet\Rounding\RoundingInterface; use App\Timesheet\Rounding\RoundingInterface;
use App\Widget\Type\CompoundRow; use App\Widget\Type\CompoundRow;
use App\Widget\Type\Counter;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface; use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -416,7 +417,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('end')->end() ->scalarNode('end')->end()
->scalarNode('icon')->defaultValue('')->end() ->scalarNode('icon')->defaultValue('')->end()
->scalarNode('color')->defaultValue('')->end() ->scalarNode('color')->defaultValue('')->end()
->scalarNode('type')->defaultValue('counter')->end() ->scalarNode('type')->defaultValue(Counter::class)->end()
->end() ->end()
->end() ->end()
; ;

2
templates/export/index.html.twig
View File

@@ -49,7 +49,7 @@
</button> </button>
{% endfor %} {% endfor %}
</div> </div>
{{ form_widget(form.preview, {'attr': {'data-toggle': 'tooltip', 'title': 'limited_entries'|trans({'%max%': preview_max})}}) }} {{ form_widget(form.preview) }}
{% endblock %} {% endblock %}
{% block box_after %}{{ form_end(form) }}{% endblock %} {% block box_after %}{{ form_end(form) }}{% endblock %}
{% endembed %} {% endembed %}