12371 Commits

Author SHA1 Message Date
fdaba87264 Fix translation key casing for 'First name' label
Updated the translation key from 'firstName' to 'First name' in the details view template to ensure consistency with the expected translation format. This improves clarity and alignment with other labels.
2025-08-11 08:18:29 +02:00
e635572fe3 Add flash message for successful third-party merge
This commit introduces a flash message to inform users when a third-party merge is successful. It uses Symfony's `FlashBag` and `TranslatableMessage` for better user feedback and localization support.
2025-08-11 08:18:29 +02:00
a72635a68d Fix merging: update the thirdparty related column and not the other one 2025-08-11 08:18:29 +02:00
18be65a56a Fix merge service and test 2025-08-11 08:18:29 +02:00
baa5ba6b7c Remove redundant lines in test 2025-08-11 08:18:29 +02:00
73cda4b2eb Fix translation and cs-fixes 2025-08-11 08:18:28 +02:00
57dffc2038 Remove the transferData method from mergeService 2025-08-11 08:17:59 +02:00
21b7a11128 redo test 2025-08-11 08:17:59 +02:00
fd494c02b1 phpstan and php cs fixer 2025-08-11 08:17:59 +02:00
cd3b015b18 validate thirdparty merge 2025-08-11 08:17:59 +02:00
8b334b0e5d Add suggested thirdparties, with same parent, for thirdparties of kind 'child' 2025-08-11 08:17:59 +02:00
d587c156ff Adjust templates and add translations 2025-08-11 08:17:57 +02:00
1eec905a4c Modify translations and if conditions in updateReference method 2025-08-11 08:17:26 +02:00
18b86a116f Add translations 2025-08-11 08:16:52 +02:00
ea7ccdc205 Remove dumps and inject thirdparty directly into controller action 2025-08-11 08:16:17 +02:00
5b1b0f7fb1 Resolve manyToMany cases 2025-08-11 08:16:17 +02:00
480dcf2b2b Refactor merge 2025-08-11 08:16:17 +02:00
39235f8f88 Continue thirdparty merge controller and create views 2025-08-11 08:16:17 +02:00
35acef61e1 Renamen and reorganize thirdparty merge files 2025-08-11 08:16:17 +02:00
fa9daf2ba5 Create thirdparty merge test 2025-08-11 08:16:17 +02:00
35afccd107 Create thirdparty merge manager 2025-08-11 08:16:17 +02:00
99999e0004 Use sql statements for transferData method and fix updateReferences method 2025-08-11 08:16:17 +02:00
7f341ba733 Continue thirdparty merge controller and create views 2025-08-11 08:16:17 +02:00
b593d9f4dd Renamen and reorganize thirdparty merge files 2025-08-11 08:16:17 +02:00
f1307400d0 WIP Create thirdparty merge controller 2025-08-11 08:16:17 +02:00
bcea6e0f90 Create thirdparty merge test 2025-08-11 08:16:17 +02:00
0f29d7c590 Create thirdparty merge manager 2025-08-11 08:16:17 +02:00
aa085a1562 **fix:** add min and step attributes to integer field in DateIntervalType 2025-08-06 17:35:45 +02:00
2754251fdc Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles 2025-08-06 14:20:29 +02:00
2f6cef4238 - **fix:** move closing motive up to be coherent with display elsewhere 2025-08-06 14:20:09 +02:00
2309636eae - **fix:** adjust display logic for accompanying period dates, include closing date if period is closed. 2025-08-06 13:47:29 +02:00
56ec8fb516 Remove 'to_validate' as default for task filter 2025-08-06 09:05:39 +02:00
fe6e6e54c1 Show filters on list pages unfolded by default 2025-07-22 15:50:49 +02:00
2a09594b4a UI improvement: limit display of particapations in event list page 2025-07-22 13:26:44 +02:00
7c798e1f63 Merge branch '387-notification-user-group' into 'master'
Resolve "Notification: envoi à des groupes utilisateurs"

Closes #387

See merge request Chill-Projet/chill-bundles!842
2025-07-20 20:18:49 +00:00
ab8da4ab7a Resolve "Notification: envoi à des groupes utilisateurs" 2025-07-20 20:18:49 +00:00
5bdb2df929 Merge branch 'revert-5f016734' into 'master'
Revert "Merge branch 'ticket/supplementary-comments-on-motive' into 'master'"

See merge request Chill-Projet/chill-bundles!863
2025-07-20 18:51:51 +00:00
e3a6b60fa2 Revert "Merge branch 'ticket/supplementary-comments-on-motive' into 'master'"
This reverts merge request !855
2025-07-20 18:50:33 +00:00
5f01673404 Merge branch 'ticket/supplementary-comments-on-motive' into 'master'
Ajout de commentaires supplémentaires aux motifs

See merge request Chill-Projet/chill-bundles!855
2025-07-11 14:06:40 +00:00
63d0a52ea1 Ajout de commentaires supplémentaires aux motifs 2025-07-11 14:06:40 +00:00
837089ff5d Fix testMerge method in AccompanyingPeriodWorkMergeServiceTest.php 2025-07-10 11:33:23 +02:00
f383fab578 Fix styling 2025-07-09 15:30:39 +02:00
f3cc4a89af Update chill bundles to v4.0.2 v4.0.2 2025-07-09 15:23:59 +02:00
703f5dc32d Transfer evaluations (and related documents) during merge 2025-07-09 15:21:42 +02:00
b870e71f77 Add translation for validation message in social action merger 2025-07-09 15:21:24 +02:00
a7e278204f
fix changelog 2025-07-09 09:22:28 +02:00
4cfdcb2f02
Release v4.0.1 with fix in package.json file v4.0.1 2025-07-08 17:00:24 +02:00
3b82ab0e7f
Release v4.0.0 v4.0.0 2025-07-08 15:59:04 +02:00
ccfae1dc75 Merge branch '339-partage-d'export-enregistré' into 'master'
Partage d'export enregistré et génération asynchrone des exports

Closes #339 and #338

See merge request Chill-Projet/chill-bundles!800
2025-07-08 13:53:38 +00:00
8bc16dadb0 Partage d'export enregistré et génération asynchrone des exports 2025-07-08 13:53:25 +00:00