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 98760a7820e24dd76c370496faa8c72eb8917ab7 Merge: 4e8125bd e7a9bcfb Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 21 15:25:57 2018 +0000 Merge branch 'release/3.2.4' CHANGELOG | 5 +++ docs/config.md | 5 ++- pollen-persistence/pom.xml | 2 +- .../pollen/persistence/entity/VoteTopiaDao.java | 20 ++++++++++ pollen-rest-api/pom.xml | 2 +- .../rest/api/PollenRestApiApplicationListener.java | 15 ++++++++ pollen-services/pom.xml | 2 +- pollen-services/src/main/config/PollenServices.ini | 14 ++++++- .../pollen/services/job/AnonymizeOlderVoteJob.java | 44 ++++++++++++++++++++++ .../pollen/services/service/PollenUserService.java | 13 +++++-- .../pollen/services/service/VoteService.java | 36 ++++++++++++++++++ .../pollen/services/service/VoterListService.java | 28 ++++++++++++-- .../i18n/pollen-services_en_GB.properties | 2 + .../i18n/pollen-services_fr_FR.properties | 2 + pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 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 ++++++++ .../src/main/web/tag/poll/Participants.tag.html | 20 +++------- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-cumulative/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-majority-judgment/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pom.xml | 2 +- 32 files changed, 234 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.