This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 4f2154635f8c2184a5984aefb0a1ad291b38c948 Merge: b74be20 6464c71 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jul 28 13:56:00 2014 +0200 Merge branch 'feature/validVoteCounting' into develop .../services/service/VoteCountingService.java | 25 +++++ .../pollen/services/service/VoteService.java | 50 +++++++--- pollen-ui-angular/src/main/webapp/js/app.js | 9 +- .../src/main/webapp/js/controllers/pollCtrl.js | 100 +++++++++++++------- pollen-ui-angular/src/main/webapp/less/style.less | 103 +++++++++++---------- .../src/main/webapp/less/variables.less | 42 ++++++++- .../src/main/webapp/partials/inline-poll.html | 15 ++- .../src/main/webapp/partials/poll.html | 36 +++++-- .../src/test/unit/pollControllersTest.js | 35 ++----- .../chorem/pollen/votecounting/VoteCounting.java | 10 +- .../pollen/votecounting/BordaVoteCounting.java | 10 +- .../pollen/votecounting/CondorcetVoteCounting.java | 12 +-- .../pollen/votecounting/CoombsVoteCounting.java | 10 +- .../votecounting/InstantRunoffVoteCounting.java | 10 +- .../pollen/votecounting/NormalVoteCounting.java | 10 +- .../pollen/votecounting/NumberVoteCounting.java | 10 +- .../votecounting/PercentageVoteCounting.java | 12 +-- 17 files changed, 314 insertions(+), 185 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.