405 Commits

Author SHA1 Message Date
5a8291dc87 merge master into branch 2022-03-21 10:21:59 +01:00
ff5aeaae17 translation changed in action evaluation section 2022-03-19 11:32:16 +01:00
184a664bf9 english text translated in thirdparty view page 2022-03-19 11:25:56 +01:00
6adb647ccc changelog updated 2022-03-17 12:31:44 +01:00
c61577edda Merge remote-tracking branch 'origin/master' into issue495_AccPeriodWorkEval_circular_reference 2022-03-14 14:42:24 +01:00
b590444375 Merge remote-tracking branch 'origin/master' into issue505_create_household_composition 2022-03-14 13:35:43 +01:00
45c4a7ae64 Merge remote-tracking branch 'origin/master' into issue504_person_ressource_create 2022-03-14 13:30:32 +01:00
33acc645ea Merge remote-tracking branch 'origin/master' into issue493_order_parcours 2022-03-14 13:27:26 +01:00
a49c53772e Merge remote-tracking branch 'origin/master' into fix_blur_toggle 2022-03-14 13:15:05 +01:00
22d593fc12 Merge remote-tracking branch 'origin/master' into issue489_address_onTheFly 2022-03-14 13:12:53 +01:00
90948e5513 Merge remote-tracking branch 'origin/master' into issue477_autosave_comment_parcours 2022-03-14 13:11:53 +01:00
0c9499dd58 Merge remote-tracking branch 'origin/master' into issue480_bug_householdrenderbox 2022-03-14 09:53:23 +01:00
nobohan
f9e8bf4f2d upd CHANGELOG 2022-03-11 10:22:09 +01:00
e153fa34e9 merge master into branch 2022-03-09 20:48:30 +01:00
d272e1398c fix merge conflict in changelog 2022-03-09 20:45:42 +01:00
8ff80ac65e changelog updated 2022-03-09 20:42:48 +01:00
fb1552f6b7 update changelog and csfixes 2022-03-09 14:07:41 +01:00
d6933fce35 add contact button color changed 2022-03-09 13:35:55 +01:00
8555277827 changelog updated 2022-03-09 11:06:10 +01:00
b02739cc3c phonenumber placeholder removed 2022-03-09 09:35:47 +01:00
b8d9d59d76 condition added to display thirdparty centers or not 2022-03-09 09:19:29 +01:00
ee82bd2867 change personne to usager and & to ET 2022-03-08 16:03:59 +01:00
nobohan
b68b43118b update CHANGELOG 2022-03-08 11:38:40 +01:00
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
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
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
2b108d0d70 update changelog 2022-03-01 15:32:47 +01:00
6769752c26 merge with master 2022-03-01 14:40:14 +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