Commit Graph

6791 Commits

Author SHA1 Message Date
julielenaerts 10a9b6c909 using normalizer for age and added obele 2022-01-27 18:13:46 +01:00
julienfastre ce912e4405 ajout compteurs 2022-01-27 17:28:59 +01:00
julienfastre ab11d3e8b3 Merge branch 'issue400_sort_activity' into 'master'
activity: order activities by date and by id

See merge request Chill-Projet/chill-bundles!301
2022-01-27 16:12:08 +00:00
juminet 445fe0cee4 activity: order activities by date and by id 2022-01-27 16:12:07 +00:00
julienfastre 7c6c8de456 Merge branch 'issue394_address_confidential' into 'master'
confidential address

See merge request Chill-Projet/chill-bundles!299
2022-01-27 16:08:58 +00:00
julienfastre 0378df42b6 fix cs 2022-01-27 17:08:00 +01:00
julienfastre ad8d40cb1c work on confidential / blur module 2022-01-27 16:52:46 +01:00
julielenaerts f4516f8369 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-01-27 16:31:41 +01:00
julielenaerts 5b25f82963 changelog updated 2022-01-27 16:24:35 +01:00
julielenaerts 8720cc730e implementation of person-text 2022-01-27 16:19:19 +01:00
julielenaerts 44d1535bfb style fixes 2022-01-27 16:18:54 +01:00
julielenaerts 8d663cdee6 creation of vue component person-text 2022-01-27 16:18:35 +01:00
julienfastre 7c8b08c3a7 Merge branch 'master' into issue394_address_confidential 2022-01-27 15:39:10 +01:00
julienfastre 6df570d96c set referrer app 2022-01-27 15:22:15 +01:00
julielenaerts 3ce650eea6 Merge branch 'issue389_add_age' of gitlab.com:Chill-Projet/chill-bundles into issue389_add_age 2022-01-27 13:03:02 +01:00
julielenaerts 6ef7d9b47b adding age in renderbox and renderstring, implementation of renderbox option in household summary 2022-01-27 12:59:14 +01:00
julielenaerts af3847366b adding age in renderbox and renderstring, implementation of renderbox option in household summary 2022-01-27 12:33:50 +01:00
julielenaerts d70f8aa712 phpstan fixes 2022-01-27 11:50:26 +01:00
julielenaerts 14463dcd38 changelog updated 2022-01-27 11:45:03 +01:00
julielenaerts b9c2d63a53 mes parcours page created 2022-01-27 11:42:14 +01:00
julielenaerts 3fd4c6339a Merge conflicts resolved 2022-01-27 11:34:57 +01:00
julienfastre 4d76de5f9f fix normalization for person in docgen 2022-01-26 23:52:27 +01:00
julienfastre 0a92ad905b variables for docgen 2022-01-26 23:49:24 +01:00
julienfastre 7af7135971 use trait to implement TrackCreationInterface and TrackUpdateInterface 2022-01-26 21:51:13 +01:00
julienfastre c70a4dc664 fix loading of evaluations 2022-01-26 21:46:07 +01:00
julienfastre dc0fae7549 fixes person resources 2022-01-26 17:53:09 +01:00
julielenaerts b38924cc3d Revert "Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles"
This reverts commit 58c4e37116.
2022-01-26 16:38:58 +01:00
julielenaerts 58c4e37116 Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-01-26 16:04:09 +01:00
julielenaerts 3656825d20 bug fix in form and controller 2022-01-26 15:56:10 +01:00
Mathieu Jaumotte 39a7cecd24 homepage_widget: improve notifications rows 2022-01-26 15:44:17 +01:00
julielenaerts 6d382f93e8 use pickDynamicUserType 2022-01-26 15:08:47 +01:00
julienfastre 6e554e74ab Merge branch 'issue382_person_resource' 2022-01-26 14:43:50 +01:00
julielenaerts 4c125865cf fix of twig if condition for person resources 2022-01-26 14:21:39 +01:00
julienfastre 12c68a4c9f Merge branch 'issue406_truncate_comment' into 'master'
Truncate comment

See merge request Chill-Projet/chill-bundles!304
2022-01-26 13:06:04 +00:00
julienfastre 66ac5c7435 Merge remote-tracking branch 'origin/master' into issue406_truncate_comment 2022-01-26 14:03:49 +01:00
julienfastre e4b46a188c Merge branch 'master' into issue406_truncate_comment 2022-01-26 14:01:42 +01:00
julienfastre 7a78e8a6a7 fixes for pesonnes ressources 2022-01-26 14:00:45 +01:00
julienfastre 4496836cb2 Merge branch 'issue382_person_resource' into 'master'
Creation of PersonResource

See merge request Chill-Projet/chill-bundles!291
2022-01-26 12:52:15 +00:00
LenaertsJ 88d1fe24b4 Creation of PersonResource 2022-01-26 12:52:15 +00:00
julienfastre 0ea1708fe9 Merge branch 'master' into issue382_person_resource 2022-01-26 13:50:58 +01:00
julienfastre a9b7cf93e9 adaptation for list for regulation 2022-01-26 13:50:19 +01:00
julielenaerts 5d36e56641 changelog updated 2022-01-26 12:57:14 +01:00
julielenaerts f00dfad98e csfixes 2022-01-26 12:56:02 +01:00
julielenaerts 7943c22ae7 comments truncated and link added to comment page 2022-01-26 12:55:48 +01:00
julielenaerts d365fcea39 merge conflict in changelog resolved 2022-01-26 12:13:37 +01:00
julielenaerts 9f9f9d7881 csfixes 2022-01-26 12:10:51 +01:00
julielenaerts 20f814766c merge fixes 2022-01-26 12:10:18 +01:00
julielenaerts ed00a882af cs-fixes 2022-01-26 12:08:18 +01:00
julielenaerts 5d7501d36e violation added if all three association entities are null 2022-01-26 12:08:18 +01:00
julielenaerts ab5f9923a6 CSfixer changes 2022-01-26 12:08:18 +01:00