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 eece515b63a55d8563f07e9bb060dd144d48dc50 Merge: 4023935c 5a4bbdc4 Author: Jean Couteau <couteau@codelutin.com> Date: Sat Dec 21 13:15:32 2019 +0100 Merge branch 'feature/254-choixMini' into 'develop' fixes #254 - Ajouter un nombre minimum de choix pour obliger les gens à voter Closes #254 See merge request chorem/pollen!40 .../converter/VoteCountingConfigDeserializer.java | 25 +++++++++++++---- pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + .../src/main/web/tag/poll/EditVote.tag.html | 14 +++++----- .../MaxChoicesNumberConfig.tag.html | 32 ++++++++++++++++++++-- ....java => AbstractVoteCountingMinMaxChoice.java} | 19 +++++++++++-- ...rConfig.java => MinMaxChoicesNumberConfig.java} | 11 +++++++- .../i18n/pollen-votecounting-api_en_GB.properties | 1 + .../i18n/pollen-votecounting-api_fr_FR.properties | 3 +- .../chorem/pollen/votecounting/BordaConfig.java | 4 +-- .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 6 ++-- .../votecounting/NormalVoteCountingStrategy.java | 4 +-- .../NormalVoteCountingStrategyTest.java | 4 +-- .../pollen/votecounting/NumberVoteCounting.java | 6 ++-- .../votecounting/NumberVoteCountingStrategy.java | 4 +-- .../NumberVoteCountingStrategyTest.java | 4 +-- 16 files changed, 103 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.