Merge branch 'dune-risky'

Conflicts: src/Bundle/ChillActivityBundle/config/services.yaml src/Bundle/ChillPersonBundle/translations/messages.fr.yml
2025-08-20 14:43:49 +00:00 · 2021-06-02 16:23:45 +02:00
parent 126ffc55bf cfd9f1bab1
commit 980a305456
38 changed files with 1267 additions and 426 deletions
--- a/src/Bundle/ChillMainBundle/config/routes.yaml
+++ b/src/Bundle/ChillMainBundle/config/routes.yaml
@@ -1,3 +1,7 @@
+chill_main_controllers:
+    resource: '../Controller/'
+    type: annotation
+
 chill_main_admin_permissionsgroup:
    resource: "@ChillMainBundle/config/routes/permissionsgroup.yaml"
    prefix:   "{_locale}/admin/permissionsgroup"
--- a/src/Bundle/ChillMainBundle/config/services/timeline.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/timeline.yaml
@@ -4,4 +4,7 @@ services:
        arguments:
            - "@doctrine.orm.entity_manager"
        calls:
-            - [ setContainer, ["@service_container"]]
+            - [ setContainer, ["@service_container"]]
+    # alias:
+    Chill\MainBundle\Timeline\TimelineBuilder: '@chill_main.timeline_builder'
+