7036 Commits

Author SHA1 Message Date
8bf179934d update psalm to ignore new error (sorry) 2022-02-28 11:37:03 +01:00
f93282d657 fix cs 2022-02-28 10:13:00 +01:00
3a602385cc Merge remote-tracking branch 'origin/master' into issue388_order_social_issues 2022-02-28 09:51:40 +01:00
e46220ff72 [Household - list members during membership] avoid to show two membersship with the same person 2022-02-24 09:45:46 +01:00
nobohan
f0e6bfc6c6 update CHANGELOG 2022-02-22 12:57:16 +01:00
nobohan
d4283a0b94 social issue api controller: correct orderBy query 2022-02-22 12:53:47 +01:00
nobohan
568c4b60ef merge master into issue388 2022-02-22 12:47:56 +01:00
nobohan
736ca2272b fix unused imports 2022-02-22 12:44:40 +01:00
nobohan
88059884ec fix unused imports 2022-02-22 12:40:46 +01:00
nobohan
ce1d213082 [person] order social issues: remove custom controller and order only by 'ordering' 2022-02-22 12:36:04 +01:00
8f597eb254 update changelog 2022-02-21 17:40:09 +01:00
775d223be2 fix cs 2022-02-21 17:30:33 +01:00
3849776511 Merge remote-tracking branch 'origin/master' into kill_small_issues 2022-02-21 17:29:37 +01:00
cb3301bcef Merge remote-tracking branch 'origin/master' into thirdparty/redirect-to-parent-when-child-is-viewed 2022-02-21 17:27:20 +01:00
8d74566eac update changelog 2022-02-21 17:20:15 +01:00
4a03c2aa43 Merge remote-tracking branch 'origin/master' into issue447_pickCivilityType 2022-02-21 17:19:21 +01:00
0a2e2301a9 document ThirdParty type and categories [ci-skip] 2022-02-21 15:25:46 +01:00
bb8898a4ec Merge branch 'course_add_event_on_person_move' into 'master'
Course add event on person move

See merge request Chill-Projet/chill-bundles!333
2022-02-21 12:29:43 +00:00
213da59b0b fix test failing due to microseconds difference 2022-02-21 13:22:35 +01:00
4e9879ba92 update changelog 2022-02-21 12:49:19 +01:00
0690704391 Merge remote-tracking branch 'origin/master' into course_add_event_on_person_move 2022-02-21 12:46:10 +01:00
610b861345 fix test on PersonAddressMoveEvent::personChangeAddress 2022-02-21 12:44:43 +01:00
b7f8ba4385 fix cs 2022-02-21 00:52:40 +01:00
a923a1f135 update changelog [ci-skip] 2022-02-21 00:41:50 +01:00
0d804dd817 3party: redirect to parent when child is opened in view mode 2022-02-21 00:39:02 +01:00
4f4b1bfbaa PersonAddressMove: fix tests, address history on household, and household::getMembersOnRange 2022-02-21 00:12:57 +01:00
caa63ea97a PersonAddressMoveEvent on household move (wip) 2022-02-19 14:04:51 +01:00
8675bb65c1 PersonMoveEventSubscriber: handle case when the move is before the last
locationHistory, but the move affects "now"
2022-02-19 10:27:44 +01:00
104af6d9b5 allow null value in end date in location history 2022-02-19 09:43:20 +01:00
2f2d4493ae Merge remote-tracking branch 'origin/master' into course_add_event_on_person_move 2022-02-19 09:31:00 +01:00
b65dacca72 bugfix onthefly thirdparty edit form
phonenumber was interchanged with telephone. Editing phonenumber was therefore not possible
2022-02-18 16:25:13 +01:00
265c8b776b bugfix in resourceItem
when address is null it gave an error and modal wouldn't close
2022-02-18 16:25:13 +01:00
4920c8b28b Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 15:59:54 +01:00
4f9acf3174 use correct translatorInterface instead of deprecated one 2022-02-18 15:59:36 +01:00
962957409b use correct translatorInterface instead of deprecated one 2022-02-18 15:51:52 +01:00
0b4d79fd5e display only last three actions in parcours resume 2022-02-18 15:51:00 +01:00
0efd3d2af3 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-02-18 14:46:55 +01:00
cfe32828a4 csfixes 2022-02-18 14:38:09 +01:00
ee8044b857 Merge branch 'workflow/fix-sending-notifications' into 'master'
workflow: fix sending notifications

See merge request Chill-Projet/chill-bundles!347
2022-02-17 22:40:53 +00:00
1fda56b5f7 Merge remote-tracking branch 'origin/master' into workflow/fix-sending-notifications 2022-02-17 23:34:20 +01:00
ca79da2f9b Merge branch 'issue434_endDate_enfantHorsMenage' into 'master'
Add end date field for enfant hors menage

See merge request Chill-Projet/chill-bundles!341
2022-02-17 22:33:47 +00:00
c90e6231f9 Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage 2022-02-17 23:31:14 +01:00
e86fa41180 Merge branch 'issue448_search_3rd_party' into 'master'
thirdparty search: add where clause for searching into children

See merge request Chill-Projet/chill-bundles!344
2022-02-17 22:28:25 +00:00
ebea4b7008 Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage 2022-02-17 23:25:07 +01:00
9565464489 Merge branch 'homepage/add-workflow' into 'master'
add workflow on widget homepage

See merge request Chill-Projet/chill-bundles!343
2022-02-17 22:19:25 +00:00
05f83bf566 Merge remote-tracking branch 'origin/master' into issue448_search_3rd_party 2022-02-17 23:16:41 +01:00
673d0c1e53 Merge branch 'issue422_and_others_on_AddPersons' into 'master'
addPersons improvements

See merge request Chill-Projet/chill-bundles!340
2022-02-17 22:15:43 +00:00
fe35a29fb8 homepage vue / my workflow: replace "document" by object type 2022-02-17 23:12:14 +01:00
53d51fea2f Merge remote-tracking branch 'origin/master' into issue422_and_others_on_AddPersons 2022-02-17 22:51:52 +01:00
caaebd593b misc fixes for Thirdparty / addPerson
* set default values for ThirdParty in ThirdParty.vue
* set correct value for binding with phone (telephone instead of
phonenumber)
* add validation on ThirdParty/denomination: at least two characters, no
Null value
2022-02-17 22:42:52 +01:00