This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d18a3302 Merge branch 'feature/CVE-updates' into 'develop' new 32be1952 ref #207 : correction de la validation des votes (entre autre la limitation des votes cumulatifs) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 32be19522004c9c0073eb4872ee18027b321b4dd Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 15 10:17:41 2018 +0200 ref #207 : correction de la validation des votes (entre autre la limitation des votes cumulatifs) Summary of changes: .../pollen/services/service/VoteCountingService.java | 12 +++++++----- .../src/main/web/tag/poll/EditVote.tag.html | 5 ++--- .../voteCountingType/MajorityJudgmentConfig.tag.html | 7 +++++-- .../org/chorem/pollen/votecounting/VoteCounting.java | 17 +++++------------ .../chorem/pollen/votecounting/BordaVoteCounting.java | 14 +++++--------- .../i18n/pollen-votecounting-borda_en_GB.properties | 2 +- .../i18n/pollen-votecounting-borda_fr_FR.properties | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 14 +++++--------- .../pollen-votecounting-condorcet_en_GB.properties | 2 +- .../pollen-votecounting-condorcet_fr_FR.properties | 2 +- .../chorem/pollen/votecounting/CoombsVoteCounting.java | 14 +++++--------- .../i18n/pollen-votecounting-coombs_en_GB.properties | 2 +- .../i18n/pollen-votecounting-coombs_fr_FR.properties | 2 +- .../pollen/votecounting/CumulativeVoteCounting.java | 18 +++++++----------- .../pollen-votecounting-cumulative_en_GB.properties | 3 ++- .../pollen-votecounting-cumulative_fr_FR.properties | 3 ++- .../pollen/votecounting/InstantRunoffVoteCounting.java | 14 +++++--------- ...pollen-votecounting-instant-runoff_en_GB.properties | 2 +- ...pollen-votecounting-instant-runoff_fr_FR.properties | 2 +- .../votecounting/MajorityJudgmentVoteCounting.java | 15 +++++---------- ...len-votecounting-majority-judgment_en_GB.properties | 2 +- ...len-votecounting-majority-judgment_fr_FR.properties | 2 +- .../chorem/pollen/votecounting/NormalVoteCounting.java | 12 ++++-------- .../chorem/pollen/votecounting/NumberVoteCounting.java | 12 ++++-------- 24 files changed, 73 insertions(+), 107 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.