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

Release 2.1.0 (#4321)

Browse Source 
* fix deprecations
* remove unused config
* replace invalid annotation type with attribute
* use AsDoctrineListener to fix deprecation
* new ModifiedSubscriber to support custom logic and fix deprecation
* removed inheritdoc comment
* new ModifiedSubscriber to support custom logic and fix deprecation
* cleanup event dispatcher interface
* re-order annotation params
* one more doctrine based deprecation
* fix query to count active timesheets
* link to "all times" to identify active timesheets
* link icon instead of text
* fix "skin" translation in wizard
* use duration filter to show duration
* added login link command and controller
* bump tabler theme to 1.0
* added wizard to force password reset by user
* allow to configure that new accounts need to reset their password
* prevent uploading twig templates by default
* bump composer packages
* enable sandbox and basic security measures for custom twig templates for invoice and export
* bump to symfony 6.3.5
* allow to export single user reports to excel
* removed broken method to reload twig cache
* added api parameter to fetch user collection fully serialized
* allow to replace or append description via timesheet batch update
* show api username above form
This commit is contained in:
Kevin Papst
2023-10-19 11:21:50 +02:00
committed by GitHub
parent 7a5b12762a
commit 38e37f1c2e
210 changed files with 1784 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/wizard/layout.html.twig
View File

@@ -20,11 +20,13 @@
{% endblock %}
{% block wizard_progress_bar %}
{{ progress_bar({current: percent, max: 100, min: 0}) }}
{% if percent is defined and percent is not null %}
{{ progress_bar({current: percent, max: 100, min: 0}) }}
{% endif %}
{% endblock %}
{% block wizard_previous_button %}
{% if previous is defined %}
{% if previous is defined and previous is not null %}
{{ button(false, { title : 'Previous'|trans({}, 'TablerBundle'), combined: true, url: path('wizard', {'wizard': previous}) }, 'link') }}
{% endif %}
{% endblock %}
@@ -33,7 +35,7 @@
{% if form is defined %}
{{ submit_button(false, { title : 'Next'|trans({}, 'TablerBundle'), combined: true }, 'primary') }}
{% else %}
{% if next is defined %}
{% if next is defined and next is not null %}
{{ button(false, { title : 'Next'|trans({}, 'TablerBundle'), combined: true, url: path('wizard', {'wizard': next}) }, 'primary') }}
{% endif %}
{% endif %}

14
templates/wizard/password.html.twig Normal file
View File

@@ -0,0 +1,14 @@
{% extends 'wizard/layout.html.twig' %}
{% block wizard_content %}
<div class="card-body text-center py-4 p-sm-6">
<h1 class="mt-2">{{ 'wizard.password.title'|trans({}, 'wizard') }}</h1>
<p class="text-body-secondary">{{ 'wizard.password.description'|trans({}, 'wizard') }}</p>
</div>
<div class="hr-text hr-text-center hr-text-spaceless">{{ 'wizard.separator'|trans({}, 'wizard') }}</div>
<div class="card-body">
<div class="mb-3">
{{ form_rest(form) }}
</div>
</div>
{% endblock %}