Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2026-02-28 02:59:40 +00:00
Code Issues Actions Projects Releases Wiki Activity
12,249 Commits 154 Branches 126 Tags
aebeca1d7a54a535d5e528872035e081a32e052d
Commit Graph

12249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Fastré
b9231a91a3 Fix CountryOfBirthAggregator: allow to receive null data in getLabels method 2023-09-12 15:54:12 +02:00
Julien Fastré
b36e37d9c5 Fix CompositionFilter 2023-09-12 15:54:12 +02:00
Julien Fastré
899ed5d0a4 Upgrade changes from master to last rector rules 2023-09-12 15:31:20 +02:00
Julien Fastré
9375d50112 Merge remote-tracking branch 'origin/master' into rector/rules-symfony 
# Conflicts:
#	src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
#	src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php
 2023-09-12 15:21:15 +02:00
Julien Fastré
e53540ec74 Fix test on ThirdPartyDocGenNormalizer 2023-09-12 15:18:44 +02:00
Julie Lenaerts
19789acbbe php cs fixes 2023-09-12 15:18:03 +02:00
Julien Fastré
582b27fbd6 remove temporarily test from ChillReportBundle suite 2023-09-12 14:45:03 +02:00
Julie Lenaerts
77180ebb0c Fix error in the doublons queries 2023-09-12 14:19:10 +02:00
Julie Lenaerts
6e2377b7ee remove commented code 2023-09-12 13:21:58 +02:00
Julie Lenaerts
4d111cd6cf filter out active centers in api 2023-09-11 16:37:27 +02:00
Julie Lenaerts
9600543fec Merge branch 'master' into use_crud_for_center 2023-09-11 14:57:51 +02:00
Julie Lenaerts
86315b1579 only show active centers from the reachable centers for creation of person 2023-09-11 14:43:52 +02:00
Julie Lenaerts
0355699a69 php cs fix 2023-09-11 13:53:40 +02:00
Julie Lenaerts
efd43c3791 refactor code after review 2023-09-11 13:53:09 +02:00
Julie Lenaerts
f770664798 phpstan fix 2023-09-11 13:06:07 +02:00
Julie Lenaerts
74645c065b use different logic to decide whether mission type filter should be shown 2023-09-11 13:01:43 +02:00
Julie Lenaerts
c1d70ec63e try fix error cannot insert multiple commands into prepared statement 2023-09-11 11:23:21 +02:00
Julie Lenaerts
36ca0fcbfc php cs fixer 2023-09-08 10:50:57 +02:00
Julie Lenaerts
91c4c3c270 Merge branch 'master' into tasks_mission_type_filter 2023-09-08 10:49:44 +02:00
Julie Lenaerts
92b1b17679 Merge branch 'master' into 38-gestion-doublon 2023-09-07 16:08:27 +02:00
Julie Lenaerts
c19d1ff0c7 php cs fixer 2023-09-07 16:08:18 +02:00
Julie Lenaerts
94f26df81e Make test personMove work for centers 2023-09-07 16:07:23 +02:00
Julien Fastré
ae9f1e3905 Merge branch '133-location-asideactivity' into 'master' 
Resolve "Ajouter la localisation aux activités annexes"

Closes #133

See merge request Chill-Projet/chill-bundles!581
 2023-09-07 11:13:18 +00:00
Julien Fastré
b6fe830f1e use newer notation for declaring service 2023-09-07 13:08:55 +02:00
Julien Fastré
665f0b4ccb Use PickUserLocationType instead of an EntityType 2023-09-07 13:08:55 +02:00
Julien Fastré
30fa57b999 remove unused comment on Version migration 2023-09-07 12:57:41 +02:00
Mathieu Jaumotte
0a6131abcc csfixer after (rebuild php container) 2023-09-07 12:16:47 +02:00
Mathieu Jaumotte
bd4f3e38eb run rector 2023-09-07 12:16:47 +02:00
Mathieu Jaumotte
75bca46b98 cs fixer 2023-09-07 12:16:47 +02:00
Mathieu Jaumotte
fe1fe31b68 add changies 2023-09-07 12:16:46 +02:00
Mathieu Jaumotte
46a5464429 Fix missing translation in acpw exports 2023-09-07 12:16:46 +02:00
Mathieu Jaumotte
67ea62f33d Feature: [export] add byLocation filter/aggregators in asideActivity exports 2023-09-07 12:16:46 +02:00
Mathieu Jaumotte
0e16ab4c18 Feature: add location in asideActivity pages (user currentLocation by default) 2023-09-07 12:16:45 +02:00
Mathieu Jaumotte
a68fef8547 Feature: migrate changes in Location attribute in Asideactivity Entity 2023-09-07 12:16:45 +02:00
Julien Fastré
fe89e527e6 Merge branch '136-household-reposition-date' into 'master' 
Fix bug when repositionning at same date in Household

See merge request Chill-Projet/chill-bundles!584
 2023-09-07 09:35:02 +00:00
Julien Fastré
7b28bb7561 Improve NotificationMailerTest by adding an assertion 
This assertion is performed by Prophecy's shouldBeCalled* method.
 2023-09-07 11:30:04 +02:00
Mathieu Jaumotte
8f793d8985 [test][household] add a test to check if leaveMovement write an enddate when member startdate is today 2023-09-07 11:30:04 +02:00
Mathieu Jaumotte
264e19e20a add new changie 2023-09-07 11:30:04 +02:00
Julie Lenaerts
f30b4ff452 DX php cs fixer 2023-09-06 16:22:03 +02:00
Julie Lenaerts
f3a37d435f FEATURE [form][isActive] add form field for isActive property 2023-09-06 16:21:29 +02:00
Mathieu Jaumotte
f0c6d00953 Fix: [Household] allow to set an enddate to member who is repositionned at the same date 
addMovement was correct
leaveMovement were not, enddate was not written when startdate was same
 2023-09-06 16:19:59 +02:00
Mathieu Jaumotte
fe5e1e5557 UX: minor design correction on badge-person in household banner 2023-09-06 16:19:58 +02:00
Mathieu Jaumotte
16fcd03a02 Fixed: [vuejs] fix missing translation in HouseholdMembersEditor component 2023-09-06 16:19:58 +02:00
Julien Fastré
34ee2b3ba5 Fix new CS 2023-09-06 16:18:28 +02:00
Julie Lenaerts
03baee4286 FIX [repository][center] adjust center repository to find all active entities 2023-09-06 16:07:14 +02:00
Julien Fastré
bc5c420f92 Merge branch '137-send-reply-when-adding-notification-comments' into 'master' 
Resolve: Send reply email to all recipees when add comments in notifications

See merge request Chill-Projet/chill-bundles!585
 2023-09-06 14:05:31 +00:00
Julie Lenaerts
b256c3176e FIX [migration][center] set default value in center migration to add isActive 2023-09-06 16:05:21 +02:00
Julien Fastré
53cc43f8d3 NotificationMailer: add tests when user does not have any email 2023-09-06 15:59:36 +02:00
Julien Fastré
40a72d9fca NotificationMailer: send to correct destinees 2023-09-06 15:59:35 +02:00
Julie Lenaerts
82b3025842 DX php cs fixer 2023-09-06 15:56:48 +02:00