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

Release 1.20.2 (#3320)

Browse Source
This commit is contained in:
Kevin Papst
2022-05-24 16:28:14 +02:00
committed by GitHub
parent d5f8655827
commit 5fb326db4d
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/** /**
* The current release version * The current release version
*/ */
public const VERSION = '1.20.1'; public const VERSION = '1.20.2';
/** /**
* The current release: major * 10000 + minor * 100 + patch * The current release: major * 10000 + minor * 100 + patch
*/ */
public const VERSION_ID = 12001; public const VERSION_ID = 12002;
/** /**
* The current release status, either "stable" or "dev" * The current release status, either "stable" or "dev"
*/ */

6
templates/calendar/user.html.twig
View File

@@ -10,8 +10,8 @@
{% block main %} {% block main %}
<div class="row"> <div class="row">
{% set hasDragAndDrop = (config.dragDropAmount > 0 and dragAndDrop is not empty and (dragAndDrop|filter(s => s.entries|length > 0)|length > 0)) %} {% set hasTwoColumns = (config.dragDropAmount > 0 and dragAndDrop is not empty and (dragAndDrop|filter(s => s.entries|length > 0)|length > 0)) or form is not null %}
{% if hasDragAndDrop or form is not null %} {% if hasTwoColumns %}
<div class="hidden-xs col-sm-5 col-md-4 col-lg-3 no-print"> <div class="hidden-xs col-sm-5 col-md-4 col-lg-3 no-print">
{% if form is not null %} {% if form is not null %}
{% embed '@AdminLTE/Widgets/box-widget.html.twig' %} {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
@@ -44,7 +44,7 @@
</div> </div>
{% endif %} {% endif %}
<div class="col-xs-12 {% if hasDragAndDrop %}col-sm-7 col-md-8 col-lg-9 col-print-12{% endif %}"> <div class="col-xs-12 {% if hasTwoColumns %}col-sm-7 col-md-8 col-lg-9 col-print-12{% endif %}">
{% embed '@AdminLTE/Widgets/box-widget.html.twig' %} {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
{% block box_body_class %}no-padding{% endblock %} {% block box_body_class %}no-padding{% endblock %}
{% block box_body %} {% block box_body %}

20
templates/invoice/index.html.twig
View File

@@ -35,26 +35,26 @@
{% block box_body %} {% block box_body %}
{{ form_errors(form) }} {{ form_errors(form) }}
{% if form.searchTerm is defined %} {% if form.searchTerm is defined %}
{{ form_row(form.searchTerm) }} {{ form_row(form.searchTerm, {'row_attr': {'class': 'invoice_search_form_row_searchTerm'}}) }}
{% endif %} {% endif %}
{{ form_row(form.daterange) }} {{ form_row(form.daterange, {'row_attr': {'class': 'invoice_search_form_row_daterange'}}) }}
{{ form_row(form.customers) }} {{ form_row(form.customers, {'row_attr': {'class': 'invoice_search_form_row_customers'}}) }}
{{ form_row(form.projects) }} {{ form_row(form.projects, {'row_attr': {'class': 'invoice_search_form_row_projects'}}) }}
{% if form.activities is defined %} {% if form.activities is defined %}
{{ form_row(form.activities) }} {{ form_row(form.activities, {'row_attr': {'class': 'invoice_search_form_row_activities'}}) }}
{% endif %} {% endif %}
{% if form.tags is defined %} {% if form.tags is defined %}
{{ form_row(form.tags) }} {{ form_row(form.tags, {'row_attr': {'class': 'invoice_search_form_row_tags'}}) }}
{% endif %} {% endif %}
{% if form.users is defined %} {% if form.users is defined %}
{{ form_row(form.users) }} {{ form_row(form.users, {'row_attr': {'class': 'invoice_search_form_row_users'}}) }}
{% endif %} {% endif %}
{% if form.exported is defined %} {% if form.exported is defined %}
{{ form_row(form.exported) }} {{ form_row(form.exported, {'row_attr': {'class': 'invoice_search_form_row_exported'}}) }}
{% endif %} {% endif %}
{{ form_row(form.template) }} {{ form_row(form.template, {'row_attr': {'class': 'invoice_search_form_row_template'}}) }}
{% if form.markAsExported is defined %} {% if form.markAsExported is defined %}
{{ form_row(form.markAsExported) }} {{ form_row(form.markAsExported, {'row_attr': {'class': 'invoice_search_form_row_markAsExported'}}) }}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block box_footer%} {% block box_footer%}