06e8264dde
Merge branch 'refs/heads/master' into ticket-app-master
...
# Conflicts:
# src/Bundle/ChillPersonBundle/Resources/public/types.ts
# src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
2025-07-02 17:28:59 +02:00
70e75adb7d
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-07-02 13:57:20 +02:00
6f7015b152
Fix translations of form fields in admin for social actions
2025-07-02 13:56:41 +02:00
65dde1e6a0
Merge branch '390-fix-search-results' into 'master'
...
Fix participant condition in list_with_period.html.twig
Closes #390
See merge request Chill-Projet/chill-bundles!832
2025-07-02 10:59:17 +00:00
d193c50922
Merge branch '359-fusion-accompanying-period-work' into 'master'
...
Resolve "Fusion actions d'accompagnement"
Closes #359
See merge request Chill-Projet/chill-bundles!804
2025-07-02 10:53:17 +00:00
840ef6eed8
Resolve "Fusion actions d'accompagnement"
2025-07-02 10:53:16 +00:00
b4bbb1a456
Merge branch 'improve_person_resource_form' into 'master'
...
Improve person resource form
See merge request Chill-Projet/chill-bundles!846
2025-07-01 14:01:44 +00:00
606435a6b3
Pipeline corrections
2025-07-01 14:47:36 +02:00
b451d2c4a3
Merge branch 'task/1245-backend-cr-er-un-point-d-api-de-suggestion-des-usagers-person-pour-un-ticket' into 'ticket-app-master'
...
Créer un point d'api de suggestion des usagers pour un ticket
See merge request Chill-Projet/chill-bundles!845
2025-07-01 12:38:03 +00:00
4f93150874
Créer un point d'api de suggestion des usagers pour un ticket
2025-07-01 12:38:02 +00:00
404143f8a6
Merge branch 'improve_person_resource_form' of https://gitlab.com/Chill-Projet/chill-bundles into improve_person_resource_form
2025-07-01 14:34:39 +02:00
ec957a2fe3
Improve UX with better labeling in person resource form
2025-07-01 14:34:19 +02:00
8ed5e35f1a
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-07-01 14:33:27 +02:00
ec37676dab
release v3.12.1
2025-06-30 20:35:00 +02:00
2d8cda30b9
Add localizeString method to PickTemplate component for string localization
2025-06-30 20:32:17 +02:00
27d344c97d
Release v3.12.0
2025-06-30 11:00:42 +02:00
088e5692e2
Merge branch 'improve_person_resource_form' into 'master'
...
Improve admin templates for event admin entities + activity reason (category)...
See merge request Chill-Projet/chill-bundles!838
2025-06-30 08:44:24 +00:00
298044bc82
Improve admin templates for event admin entities + activity reason (category)...
2025-06-30 08:44:24 +00:00
ee4e223043
Merge branch '393-fix-dump-only-document-generator' into 'master'
...
Send data dumps as email attachments instead of links, update translations,...
Closes #393
See merge request Chill-Projet/chill-bundles!843
2025-06-30 08:41:09 +00:00
c53377ce8d
Merge branch 'workflow-do-not-remove-workflow-canceled-automatically' into 'master'
...
Remove unnecessary workflow deletion logic when in the initial position
See merge request Chill-Projet/chill-bundles!844
2025-06-30 08:40:46 +00:00
0b580658de
Remove unnecessary workflow deletion logic when in the initial position
2025-06-26 14:38:12 +02:00
786c60a50d
Send data dumps as email attachments instead of links, update translations, and add unit tests for the handler.
2025-06-26 12:21:19 +02:00
456f00566d
update juni guidelines
2025-06-26 12:19:49 +02:00
0566ab0910
Merge branch '1241-add-feature-close-open-ticket' into 'ticket-app-master'
...
Add feature open and close ticket
See merge request Chill-Projet/chill-bundles!835
2025-06-24 10:44:04 +00:00
Boris Waaub
f4eeee1598
Add feature open and close ticket
2025-06-24 10:44:03 +00:00
33cf16fc13
Merge branch 'task/1255-backend-cr-er-un-point-d-api-pour-enregistrer-le-fait-que-le-ticket-est-urgent-ou-non' into 'ticket-app-master'
...
Record that a ticket can be in emergency, or not
See merge request Chill-Projet/chill-bundles!840
2025-06-24 10:42:51 +00:00
0a331aab37
Record that a ticket can be in emergency, or not
2025-06-24 10:42:51 +00:00
d43b739654
Merge branch 'task/1240-impl-menter-un-backend-pour-cloturer-puis-r-ouvrir-le-ticket' into 'ticket-app-master'
...
Add api endpoint to open and close ticket
See merge request Chill-Projet/chill-bundles!839
2025-06-20 15:42:44 +00:00
c72432efae
Add api endpoint to open and close ticket
2025-06-20 15:42:43 +00:00
95975fae55
fix cs
2025-06-20 17:35:19 +02:00
95a7efa138
Merge branch 'master' into ticket-app-master
2025-06-20 17:35:06 +02:00
a38116cca4
fix cs
2025-06-20 17:31:13 +02:00
45e193ff6d
Merge remote-tracking branch 'origin/master' into ticket-app-master
2025-06-20 12:53:20 +02:00
dfc146ff3f
Merge remote-tracking branch 'origin/ticket-app-master' into ticket-app-master
2025-06-20 12:45:33 +02:00
nobohan
9158e33854
#392 php cs-fixer
2025-06-19 21:29:43 +02:00
nobohan
af74f7860b
Fixed nullable content for NewsItem in setContent signature #392
2025-06-19 17:53:33 +02:00
c2842148c6
Improve UX with better labeling in person resource form
2025-06-17 19:27:06 +02:00
10e4c7da23
Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles
2025-06-17 18:45:25 +02:00
bdf1cf71ba
Fix argument usage in localizeString method for UserRenderBoxBadge component
...
Adjusted `localizeString` method to accept a `label` parameter, ensuring proper localization of `user_job.label` and `main_scope.name`. Also made minor syntax adjustments to improve readability.
2025-06-17 10:55:30 +02:00
b41fcf66a9
Merge branch '1277-refacto-use-symfony-translation' into 'ticket-app-master'
...
1277 refacto use symfony translation
See merge request Chill-Projet/chill-bundles!836
2025-06-16 10:59:42 +00:00
Boris Waaub
a8dd1b3548
1277 refacto use symfony translation
2025-06-16 10:59:42 +00:00
f680a35f49
Improve admin templates for event admin entities + activity reason (category) entities and remove delete and show actions for coherence
2025-06-11 17:13:19 +02:00
7d0fe06651
Fix admin entity edit actions for event admin entities and activity reason (category) entities
2025-06-11 16:46:04 +02:00
5ee8a6bc82
Merge branch 'upgrade-ci-image' into 'master'
...
Update CI configuration to use `chill/base-image:8.3-edge` instead of the old PHP 8.2 base image
See merge request Chill-Projet/chill-bundles!834
2025-06-05 10:10:41 +00:00
47cf83ef93
Update CI configuration to use chill/base-image:8.3-edge instead of the old PHP 8.2 base image
2025-06-05 11:30:01 +02:00
fca10ada71
Fix translation keys and participant pluralization in list_with_period.html.twig
...
Updated French translations for "Participants" and improved pluralization handling in accompanying_period keys. Modified list_with_period.html.twig to dynamically translate "Participants" based on the count of current participations.
2025-06-04 16:55:56 +02:00
a35d456308
Fix participant condition in list_with_period.html.twig
...
Updated the condition to properly handle cases where the first participation's person is not the current person.
2025-06-04 16:54:44 +02:00
67c1dfa42b
Merge branch 'prepare-junie' into 'master'
...
Clean skeleton (and add Junie guidelines)
See merge request Chill-Projet/chill-bundles!830
2025-06-04 08:13:36 +00:00
49cbb6a002
Clean skeleton (and add Junie guidelines)
2025-06-04 08:13:35 +00:00
2b99a480ac
Add StateHistory and StateEnum entities to track ticket state changes
...
Integrated the `StateHistory` entity to manage state transitions in tickets and the `StateEnum` for defining state values (`open`, `closed`). Updated `Ticket` to handle associations with state histories and provide state management methods. Added migration for `state_history` table and extended `TicketTest` for state-related tests.
2025-06-03 12:19:52 +02:00
