This is an automated email from the git hooks/post-receive script. New commit to branch master in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 5989d7d95669950fbcecaafa29c52597bfb5cdc8 Merge: bdf3b65c 41342262 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 3 09:46:32 2017 +0200 Merge branch 'hotfix/3.0.1' CHANGELOG | 6 ++ pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/service/VoteService.java | 93 ++++++++++++++++------ .../services/service/security/SecurityService.java | 32 ++++++-- pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/pom.xml | 2 +- pollen-ui-riot-js/src/main/web/i18n/en.json | 6 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 6 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 44 +++++----- pollen-ui-riot-js/src/main/web/js/Session.js | 2 + pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 13 ++- .../src/main/web/tag/poll/Choice.tag.html | 2 +- .../src/main/web/tag/poll/Votes.tag.html | 2 +- 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-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 158 insertions(+), 78 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.