merge fixes

This commit is contained in:
Julie Lenaerts 2022-01-26 12:10:18 +01:00
parent ed00a882af
commit 20f814766c
2 changed files with 1 additions and 2 deletions

View File

@ -11,6 +11,7 @@ and this project adheres to
## Unreleased ## Unreleased
<!-- write down unreleased development here --> <!-- write down unreleased development here -->
* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
## Test releases ## Test releases
@ -55,7 +56,6 @@ and this project adheres to
* vuejs: add validation on required fields for AddPerson, Address and Location components * vuejs: add validation on required fields for AddPerson, Address and Location components
* vuejs: treat 422 validation errors in locations and AddPerson components * vuejs: treat 422 validation errors in locations and AddPerson components
* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380) * [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
### test release 2022-01-12 ### test release 2022-01-12

View File

@ -20,5 +20,4 @@ module.exports = function(encore, entries)
encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js'); encore.addEntry('page_accompanying_course_index_masonry', __dirname + '/Resources/public/page/accompanying_course_index/masonry.js');
encore.addEntry('page_person_resource_showhide_input', __dirname + '/Resources/public/page/person_resource/showhide-input.js'); encore.addEntry('page_person_resource_showhide_input', __dirname + '/Resources/public/page/person_resource/showhide-input.js');
encore.addEntry('page_suggest_names', __dirname + '/Resources/public/page/person/suggest-names.js'); encore.addEntry('page_suggest_names', __dirname + '/Resources/public/page/person/suggest-names.js');
encore.addEntry('page_person_resource', __dirname + '/Resources/public/page/person_resource/index.js');
}; };