This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 82816c1411c2d3899af611da9ba2afd39eb78b0b Merge: c79e069d 27b62dfd Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Sep 21 16:06:04 2018 +0200 Merge branch 'feature/210-rgpd' into 'develop' Feature/210 rgpd Closes #210 See merge request chorem/pollen!20 docs/config.md | 5 ++- .../pollen/persistence/entity/VoteTopiaDao.java | 20 ++++++++++++ .../rest/api/PollenRestApiApplicationListener.java | 15 +++++++++ pollen-services/src/main/config/PollenServices.ini | 14 ++++++++- .../pollen/services/job/AnonymizeOlderVoteJob.java | 23 ++++++++++++++ .../pollen/services/service/PollenUserService.java | 13 ++++++-- .../pollen/services/service/VoteService.java | 36 ++++++++++++++++++++++ .../i18n/pollen-services_en_GB.properties | 2 ++ .../i18n/pollen-services_fr_FR.properties | 2 ++ pollen-ui-riot-js/src/main/web/i18n/en.json | 3 ++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 3 ++ .../src/main/web/tag/poll/EditVote.tag.html | 15 +++++++++ .../src/main/web/tag/poll/EditVoteOrder.tag.html | 16 ++++++++++ 13 files changed, 162 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.