|
|
7b17dc692e
|
Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles
|
2022-03-01 16:14:00 +01:00 |
|
|
|
1a05ffab96
|
fix flex item-col placement for documents list
|
2022-03-01 16:13:11 +01:00 |
|
|
|
d2ecc5d3a3
|
Merge branch 'issue442_toggle_emergency' into 'master'
Toggle emergency only by referrer
See merge request Chill-Projet/chill-bundles!331
|
2022-03-01 15:02:01 +00:00 |
|
|
|
83760cc980
|
Merge remote-tracking branch 'origin/master' into issue469_budget
|
2022-03-01 15:42:59 +01:00 |
|
|
|
2b108d0d70
|
update changelog
|
2022-03-01 15:32:47 +01:00 |
|
|
|
6769752c26
|
merge with master
|
2022-03-01 14:40:14 +01:00 |
|
|
|
695b9d5bea
|
merge with master
|
2022-03-01 14:32:03 +01:00 |
|
|
|
ecc2e390f7
|
Merge remote-tracking branch 'origin/master' into issue463
|
2022-03-01 09:48:19 +01:00 |
|
|
|
a6ac6ee6d8
|
fix merge conflicts
|
2022-02-28 19:47:22 +01:00 |
|
|
|
06c279627a
|
Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02
|
2022-02-28 16:29:57 +01:00 |
|
|
|
cdd21c94c6
|
Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf
|
2022-02-28 15:11:50 +01:00 |
|
|
|
260ce8ba17
|
issue 463: add delete button on draft periods page
|
2022-02-28 14:47:35 +01:00 |
|
|
|
e10a6b4bf2
|
Merge branch 'issue441_enfant_confie'
|
2022-02-28 14:37:38 +01:00 |
|
|
|
08fa1edbee
|
Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact
|
2022-02-28 14:22:52 +01:00 |
|
|
|
fb6f0c316e
|
update changelog
|
2022-02-28 12:22:17 +01:00 |
|
|
|
fe89704672
|
Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact
|
2022-02-28 11:39:16 +01:00 |
|
|
|
24c79cc4b1
|
fix merge conflicts
|
2022-02-28 10:20:29 +01:00 |
|
|
|
3a602385cc
|
Merge remote-tracking branch 'origin/master' into issue388_order_social_issues
|
2022-02-28 09:51:40 +01:00 |
|
|
|
2e59c1415b
|
csfixes plus changelog updated
|
2022-02-25 16:24:25 +01:00 |
|
nobohan
|
1826b20b40
|
upd CHANGELOG
|
2022-02-25 15:26:08 +01:00 |
|
|
|
3a5e956e49
|
updated changelog
|
2022-02-25 13:20:46 +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 |
|
|
|
0601fa0142
|
changelog updated
|
2022-02-23 10:24:24 +01:00 |
|
nobohan
|
f0e6bfc6c6
|
update CHANGELOG
|
2022-02-22 12:57:16 +01:00 |
|
nobohan
|
fbeda163f0
|
update CHANGELOG
|
2022-02-22 12:07:56 +01:00 |
|
|
|
8f597eb254
|
update changelog
|
2022-02-21 17:40:09 +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 |
|
|
|
4e9879ba92
|
update changelog
|
2022-02-21 12:49:19 +01:00 |
|
|
|
a923a1f135
|
update changelog [ci-skip]
|
2022-02-21 00:41:50 +01:00 |
|
|
|
4f9acf3174
|
use correct translatorInterface instead of deprecated one
|
2022-02-18 15:59:36 +01:00 |
|
nobohan
|
8c7da5f80c
|
Merge branch 'master' into issue345_internal_thirdparty_contact
|
2022-02-18 11:22:51 +01:00 |
|
nobohan
|
57175e1c0b
|
upd CHANGELOG
|
2022-02-18 09:18:09 +01:00 |
|
|
|
1fda56b5f7
|
Merge remote-tracking branch 'origin/master' into workflow/fix-sending-notifications
|
2022-02-17 23:34:20 +01:00 |
|
|
|
c90e6231f9
|
Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage
|
2022-02-17 23:31:14 +01:00 |
|
|
|
ebea4b7008
|
Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage
|
2022-02-17 23:25:07 +01:00 |
|
|
|
05f83bf566
|
Merge remote-tracking branch 'origin/master' into issue448_search_3rd_party
|
2022-02-17 23:16:41 +01:00 |
|
|
|
53d51fea2f
|
Merge remote-tracking branch 'origin/master' into issue422_and_others_on_AddPersons
|
2022-02-17 22:51:52 +01:00 |
|
|
|
a9aeea234c
|
Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations
|
2022-02-17 21:45:43 +01:00 |
|
|
|
1683685f6b
|
Merge branch 'issue465_display_person_resources' into 'master'
Display more info for person ressources
See merge request Chill-Projet/chill-bundles!338
|
2022-02-17 20:38:32 +00:00 |
|
|
|
e4aac56f2d
|
Merge remote-tracking branch 'origin/master' into issue415_filter_suggested_entities_by_close_participations
|
2022-02-17 21:35:18 +01:00 |
|
|
|
f86c0353a2
|
Merge remote-tracking branch 'origin/master' into issue465_display_person_resources
|
2022-02-17 21:17:40 +01:00 |
|
|
|
0a289e1edd
|
Merge remote-tracking branch 'origin/master' into issue476_activity_fix_concerned_group
|
2022-02-17 21:11:45 +01:00 |
|
|
|
68bfca8a1f
|
Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency
|
2022-02-17 20:04:45 +01:00 |
|
nobohan
|
341177aa5e
|
fix conflict in CHANGELOG
|
2022-02-17 14:22:55 +01:00 |
|
|
|
62f54a3c27
|
changelog updated
|
2022-02-17 09:57:39 +01:00 |
|
|
|
95b2fcead7
|
update changelog [ci-skip]
|
2022-02-16 21:58:49 +01:00 |
|
nobohan
|
dd99c35e35
|
upd CHANGELOG
|
2022-02-16 11:24:30 +01:00 |
|
nobohan
|
9d651a70e9
|
merge last AddPerson branch
|
2022-02-16 11:23:21 +01:00 |
|
