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 d0f6837 gestion des listes de favoris new a45b1d8 refs #15 affichage ou non de la limite de choix à sélectionner en fonction du type de sondage new aef052c refs #15 ajout de la possibilité ou non de limiter le nombre de choix par vote en fonction du type (+ ajout des bornes min max des valeurs possibles et correction des messages d'erreur) new 1ca4434 refs #15 ajout des nouvelles propriétés des types de vote new e1b985f Conversion des chaines vides en Double null (pour les votes) new 7898850 refs #15 prise en compte de la limite de choix par vote + gestion des erreurs sur le vote new e3445fe Gestion des messages d'erreur de vote dans les types de vote The 6 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 e3445feac5975f411a283379a095d631d67365d1 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 13 17:50:47 2017 +0200 Gestion des messages d'erreur de vote dans les types de vote commit 7898850c9790be0d5b99c4ee2085233c20fd91ad Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 13 17:49:24 2017 +0200 refs #15 prise en compte de la limite de choix par vote + gestion des erreurs sur le vote commit e1b985f05c79117284ca99a238e41b01a16dd680 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 13 17:48:45 2017 +0200 Conversion des chaines vides en Double null (pour les votes) commit 1ca4434222d76ee47cca65cad7d11a2d818fc10c Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 13 17:47:54 2017 +0200 refs #15 ajout des nouvelles propriétés des types de vote commit aef052cea55ef15be98f2f24ff619c0769a82ec8 Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 13 17:46:01 2017 +0200 refs #15 ajout de la possibilité ou non de limiter le nombre de choix par vote en fonction du type (+ ajout des bornes min max des valeurs possibles et correction des messages d'erreur) commit a45b1d85932eb294ce5d9e8fe430f89d22762f3f Author: Kevin Morin <morin@codelutin.com> Date: Thu Apr 13 17:43:40 2017 +0200 refs #15 affichage ou non de la limite de choix à sélectionner en fonction du type de sondage Summary of changes: .../org/chorem/pollen/rest/api/JsonHelper.java | 12 +++- .../pollen/services/bean/VoteCountingTypeBean.java | 30 ++++++++ .../pollen/services/service/PollService.java | 5 +- .../services/service/VoteCountingService.java | 22 +++--- .../services/service/VoteCountingTypeService.java | 3 + .../pollen/services/service/VoteService.java | 11 +-- .../i18n/pollen-services_fr_FR.properties | 14 ++-- pollen-ui-riot-js/src/main/web/i18n.json | 2 + .../src/main/web/tag/poll/Settings.tag.html | 57 ++++++++------- .../src/main/web/tag/poll/Votes.tag.html | 83 +++++++++++++++------- .../chorem/pollen/votecounting/VoteCounting.java | 26 ++++++- .../pollen/votecounting/BordaVoteCounting.java | 15 ++++ .../pollen-votecounting-borda_en_GB.properties | 2 +- .../pollen-votecounting-borda_fr_FR.properties | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 15 ++++ .../pollen-votecounting-condorcet_en_GB.properties | 2 +- .../pollen-votecounting-condorcet_fr_FR.properties | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 15 ++++ .../pollen-votecounting-coombs_en_GB.properties | 2 +- .../pollen-votecounting-coombs_fr_FR.properties | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 17 ++++- ...en-votecounting-instant-runoff_en_GB.properties | 2 +- ...en-votecounting-instant-runoff_fr_FR.properties | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 15 ++++ .../pollen/votecounting/NumberVoteCounting.java | 15 ++++ .../votecounting/PercentageVoteCounting.java | 15 ++++ 26 files changed, 307 insertions(+), 81 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.