prepare release 1.6 (#1270)

templates/about/layout.html.twig

@@ -42,7 +42,7 @@
                         </li>
                         <li>
                             <a href="{{ constant('App\\Constants::HOMEPAGE') }}/donate/" target="_blank">
-                                <i class="menu-icon fab fa-paypal bg-blue"></i>
+                                <i class="menu-icon fas fa-hand-holding-heart bg-blue"></i>
                                 {{ 'donate'|trans({}, 'about') }}
                             </a>
                         </li>

templates/activity/edit.html.twig

@@ -35,6 +35,7 @@
                         {{ form_row(form.hourlyRate) }}
                     </div>
                 </div>
+                {% if form.budget is defined %}
                 <div class="row">
                     <div class="col-md-6">
                         {{ form_row(form.budget) }}
@@ -43,6 +44,7 @@
                         {{ form_row(form.timeBudget) }}
                     </div>
                 </div>
+                {% endif %}
             </fieldset>
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}

templates/calendar/user.html.twig

@@ -116,7 +116,7 @@
                 weekNumbers: {% if config.showWeekNumbers %}true{% else %}false{% endif %},
                 allDaySlot: false,
                 navLinks: true,
-                locale: '{{ app.request.locale }}',
+                locale: '{{ app.request.locale|replace({'_': '-'})|lower }}',
                 /*
                 // TODO calculate height properly instead of relying on the default aspectRatio
                 height: function() {

templates/customer/edit.html.twig

@@ -81,6 +81,7 @@
                         {{ form_row(form.hourlyRate) }}
                     </div>
                 </div>
+                {% if form.budget is defined %}
                 <div class="row">
                     <div class="col-md-6">
                         {{ form_row(form.budget) }}
@@ -89,6 +90,7 @@
                         {{ form_row(form.timeBudget) }}
                     </div>
                 </div>
+                {% endif %}
             </fieldset>
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}

templates/project/edit.html.twig

@@ -42,6 +42,7 @@
                         {{ form_row(form.hourlyRate) }}
                     </div>
                 </div>
+                {% if form.budget is defined %}
                 <div class="row">
                     <div class="col-md-6">
                         {{ form_row(form.budget) }}
@@ -50,6 +51,7 @@
                         {{ form_row(form.timeBudget) }}
                     </div>
                 </div>
+                {% endif %}
             </fieldset>
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}