|
|
388b666b5d
|
person badge changed to include onTheFly + changelog updated
|
2022-03-07 14:36:44 +01:00 |
|
|
|
c7f2eedd4b
|
Merge remote-tracking branch 'origin/master' into issue484_link_household
|
2022-03-06 22:57:12 +01:00 |
|
|
|
f88d0ee19e
|
Merge remote-tracking branch 'origin/master' into issue478_remove_localisation
|
2022-03-06 22:54:48 +01:00 |
|
|
|
af79ffd544
|
Merge remote-tracking branch 'origin/master' into issue472_filter_job_user_in_set_referrer
|
2022-03-06 22:40:14 +01:00 |
|
|
|
739c7e9a77
|
Merge remote-tracking branch 'origin/master' into url_in_accompanyingPeriodWork_evaluations
|
2022-03-06 22:33:16 +01:00 |
|
|
|
2012df512c
|
merge conflict fixed
|
2022-03-04 17:27:26 +01:00 |
|
|
|
b6e530fec6
|
update changelog
|
2022-03-04 17:25:37 +01:00 |
|
|
|
5605813826
|
Update changelog
|
2022-03-04 17:22:27 +01:00 |
|
|
|
d0772fc306
|
Add email to twig personRenderBox
|
2022-03-04 17:08:41 +01:00 |
|
nobohan
|
def90893de
|
upd CHANGELOG
|
2022-03-04 15:12:11 +01:00 |
|
nobohan
|
1c1dec1f5b
|
upd CHANGELOG
|
2022-03-04 08:46:32 +01:00 |
|
|
|
827c85ac56
|
fix parcours localisation
|
2022-03-03 20:37:12 +01:00 |
|
nobohan
|
7b52a10943
|
upd CHANGELOG
|
2022-03-03 17:21:54 +01:00 |
|
|
|
892be42580
|
update changelog
|
2022-03-03 16:28:31 +01:00 |
|
nobohan
|
a88e052eb6
|
upd CHANGELOG
|
2022-03-03 15:12:47 +01:00 |
|
|
|
3df2335cf4
|
Merge remote-tracking branch 'origin/master' into issue464_document_on_person
|
2022-03-03 14:42:06 +01:00 |
|
nobohan
|
1b66941746
|
upd CHANGELOG
|
2022-03-03 12:05:55 +01:00 |
|
nobohan
|
23fd4be2e5
|
upd CHANGELOG
|
2022-03-03 10:17:29 +01:00 |
|
|
|
ac12e75714
|
Merge remote-tracking branch 'origin/master' into issue469_budget
|
2022-03-02 22:01:28 +01:00 |
|
|
|
fccac80222
|
Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf
|
2022-03-02 21:53:17 +01:00 |
|
|
|
c83d6d392f
|
[docgen/template] do not list template wich are inactive
See https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/473
|
2022-03-02 21:35:16 +01:00 |
|
|
|
74a84e42a6
|
update changelog and csfixes
|
2022-03-02 19:24:33 +01:00 |
|
|
|
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 |
|
