Release 2.28 (#5253)
* fix year in dashboard * make batch actions accessible via javascript * bump packages * remove BOM from CSV * rebuild assets * fix duplicated automated-email warning
This commit is contained in:
@@ -10,8 +10,4 @@
|
||||
<spacer size="16"></spacer>
|
||||
|
||||
<button class="large primary" href="{{ confirmationUrl }}">{{ 'registration.button'|trans({'%url%': confirmationUrl}, 'email') }}</button>
|
||||
|
||||
<spacer size="16"></spacer>
|
||||
|
||||
<p><small>{{ 'automated_email_dont_answer'|trans({}, 'email') }}</small></p>
|
||||
{% endblock %}
|
||||
|
||||
@@ -6,8 +6,4 @@
|
||||
|
||||
{% block body %}
|
||||
<p>{{ body|trans({}, 'email') }}<p>
|
||||
|
||||
<spacer size="16"></spacer>
|
||||
|
||||
<p><small>{{ 'automated_email_dont_answer'|trans({}, 'email') }}</small></p>
|
||||
{% endblock %}
|
||||
|
||||
@@ -10,6 +10,6 @@
|
||||
|
||||
<spacer size="32"></spacer>
|
||||
|
||||
<p><small>{{ 'automated_email_dont_answer'|trans({}, 'email') }}</small></p>
|
||||
{% block no_answer %}<p><small>{{ 'automated_email_dont_answer'|trans({}, 'email') }}</small></p>{% endblock %}
|
||||
|
||||
{% endapply %}
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
<div class="col-sm-3 col-xs-6 mt-1 mb-2 mb-md-0">
|
||||
<div class="text-center">
|
||||
<h5 class="mb-1">{{ data.year|duration }}</h5>
|
||||
<span>{{ 'stats.workingTimeYear'|trans({'%year%': data.thisMonth|date_format('Y')}) }}</span>
|
||||
<span>{{ 'stats.workingTimeYear'|trans({'%year%': data.dateYear}) }}</span>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user