merge master into branch

2025-09-19 21:24:59 +00:00 · 2022-05-04 09:31:22 +02:00
parent 0e0e0799d1 a3c3834081
commit 2ef3a3362a
381 changed files with 2334 additions and 41211 deletions
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -81,13 +81,10 @@
 {% endif %}

 {%- if form.comment is defined -%}
+    {# TODO .. public and private #}
    {{ form_row(form.comment) }}
 {% endif %}

-{%- if form.privateComment is defined -%}
-    {{ form_row(form.privateComment) }}
-{% endif %}
-
 {%- if form.attendee is defined -%}
    {{ form_row(form.attendee) }}
 {% endif %}