Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-10-01 10:59:45 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'dune-risky'

Browse Source 
Conflicts:
	src/Bundle/ChillActivityBundle/config/services.yaml
	src/Bundle/ChillPersonBundle/translations/messages.fr.yml
This commit is contained in:
Julien Fastré
2021-06-02 16:23:45 +02:00
parent 126ffc55bf cfd9f1bab1
commit 980a305456
38 changed files with 1267 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillActivityBundle/config/services.yaml
View File

@@ -22,9 +22,11 @@ services:
- '@doctrine.orm.entity_manager'
- '@chill.main.security.authorization.helper'
- '@security.token_storage'
- '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
public: true
tags:
- { name: chill.timeline, context: 'person' }
- { name: chill.timeline, context: 'center' }
Chill\ActivityBundle\Menu\:
autowire: true