297 Commits

Author SHA1 Message Date
df61fbff12 merge conflicts resolved 2022-02-14 14:55:47 +01:00
c2a132a40b Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-02-14 13:40:23 +01:00
e028c1ca2b thirdparty contact address blurred in view page if confidential 2022-02-14 11:44:12 +01:00
7dd6cd04ba Merge branch 'issue419_AddPersons_clear_ul' into 'master'
Issue419  remove ul-li in AddPersons

See merge request Chill-Projet/chill-bundles!328
2022-02-11 16:31:55 +00:00
9bcf4cce9f Merge branch 'master' into 'issue440_mesparcours_brouillon'
# Conflicts:
#   CHANGELOG.md
2022-02-11 16:22:51 +00:00
0fa119c984 Merge branch 'issue_414_documents_list' into 'master'
created and updated traits added + template property added to Document entity

See merge request Chill-Projet/chill-bundles!316
2022-02-11 15:05:21 +00:00
c30cb5879d changelog updated 2022-02-11 16:04:24 +01:00
632b1262f9 Merge remote-tracking branch 'origin/master' into issue_414_documents_list 2022-02-11 15:34:31 +01:00
e157624479 Merge branch 'master' into 'issue378_normalize_requestor'
# Conflicts:
#   CHANGELOG.md
2022-02-11 14:31:53 +00:00
981c94906d Merge remote-tracking branch 'origin/master' into issue440_mesparcours_brouillon 2022-02-11 15:11:20 +01:00
adce90c151 Merge remote-tracking branch 'origin/master' into issue440_mesparcours_brouillon 2022-02-11 15:11:08 +01:00
83f8402081 Merge branch 'issue415_household_address' into 'master'
Display address of current household in history page

See merge request Chill-Projet/chill-bundles!334
2022-02-11 14:10:52 +00:00
3c5d269ece template fixes residential address 2022-02-11 14:58:11 +01:00
15023d348a Merge remote-tracking branch 'origin/master' into issue415_household_address 2022-02-11 14:39:27 +01:00
d3d655293e Merge remote-tracking branch 'origin/master' into issue_414_documents_list 2022-02-11 14:24:36 +01:00
6578f66fec update changelog 2022-02-11 14:22:10 +01:00
f1c3e8dc1b Merge remote-tracking branch 'origin/master' 2022-02-11 14:18:20 +01:00
a9624b36f7 create person and household option added to dropdown 2022-02-11 14:17:59 +01:00
c34ce48a53 Merge branch 'master' into 'issue427_returnPath'
# Conflicts:
#   CHANGELOG.md
2022-02-11 13:16:40 +00:00
f42d106e3c Merge branch 'accent440' 2022-02-11 13:17:19 +01:00
13eddbfc5b changelog 2022-02-11 13:16:48 +01:00
add8588767 changelog updated 2022-02-11 12:36:05 +01:00
c7a830ee28 Merge branch 'master' into 'issue433_email_addPerson'
# Conflicts:
#   CHANGELOG.md
2022-02-11 11:33:09 +00:00
344981cf99 Merge branch 'master' into issue433_email_addPerson 2022-02-11 12:16:49 +01:00
28c4d6b92f vue pick entity: fix i18n translations in create thirdparty modal 2022-02-11 12:16:01 +01:00
94503505f7 changelog updated 2022-02-11 11:40:56 +01:00
nobohan
861abe708b upd CHANGELOG 2022-02-11 10:55:37 +01:00
406cfc86cd add order in localisation entity list (api) 2022-02-09 23:44:38 +01:00
3532e9dd8c changelog updated 2022-02-09 18:22:28 +01:00
4e862cc585 Changelog updated 2022-02-09 16:20:59 +01:00
d60095987c Changelog updated 2022-02-09 15:59:19 +01:00
4314823a70 change order for accompanying period work list 2022-02-08 19:36:45 +01:00
nobohan
06142797c3 AddPersons: add missing css class + upd CHANGELOG 2022-02-03 16:25:59 +01:00
nobohan
a0cadb46db upd CHANGELOG 2022-02-03 11:32:11 +01:00
nobohan
a83b0326d7 upd CHANGELOG 2022-02-02 07:04:14 +01:00
d8929a6222 Merge branch 'master' into homepage/rewrite 2022-02-01 21:26:27 +01:00
3f2454cead disable multiselect search in City and Street search 2022-02-01 21:23:15 +01:00
333224a9d5 update changelog 2022-02-01 19:19:50 +01:00
7879a99197 Merge branch 'master' into issue425_errorMessage_closeParcours 2022-02-01 18:42:59 +01:00
572aa2c14e Merge remote-tracking branch 'origin/master' into issue426_household_composition 2022-02-01 18:29:02 +01:00
bc4b2c4e86 Merge branch 'master' into issue428_person_resource_ameliorations 2022-02-01 18:08:48 +01:00
05fc5a1829 changelog updated 2022-02-01 13:52:13 +01:00
1530e9d13a changelog updated 2022-02-01 12:37:09 +01:00
2c566bb21c Merge branch 'master' into 'issue428_person_resource_ameliorations'
# Conflicts:
#   CHANGELOG.md
2022-01-31 17:50:08 +00:00
2eb1ebd263 changelog updated with bugfix 2022-01-31 17:45:22 +01:00
0689ca366d changelog updated 2022-01-31 17:44:04 +01:00
170ce2d51c minor fix and renaming 2022-01-31 16:55:19 +01:00
971789d5cf Merge remote-tracking branch 'origin/master' into foldlist_in_entity 2022-01-31 15:51:21 +01:00
44183957b8 Merge remote-tracking branch 'origin/master' into homepage/rewrite 2022-01-31 15:36:53 +01:00
0383571a9e changelog updated 2022-01-31 14:42:17 +01:00