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 4415aef105958afd0c489050ad82a87380c2c2cc Merge: 4b7a4e4 75e6f56 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 10 10:46:51 2014 +0200 (merge) Change Choice .../persistence/PollenTopiaPersistenceContext.java | 5 +- pollen-persistence/src/main/xmi/pollen.properties | 15 ++++-- pollen-persistence/src/main/xmi/pollen.zargo | Bin 18462 -> 20233 bytes .../org/chorem/pollen/rest/api/PollApiTest.java | 5 +- .../rest/api/converter/JsonArrayConverterTest.java | 4 +- .../rest/api/converter/JsonConverterTest.java | 4 +- .../chorem/pollen/services/bean/ChoiceBean.java | 28 +++++------ .../pollen/services/service/ChoiceService.java | 16 +++--- pollen-services/src/main/resources/fixtures.yaml | 4 +- .../pollen/services/service/PollServiceTest.java | 56 ++++++++++----------- .../services/service/VoteCountingServiceTest.java | 4 +- .../services/service/VoterListServiceTest.java | 4 +- .../src/main/webapp/js/controllers/pollCtrl.js | 38 +++++++------- .../src/main/webapp/partials/inline-poll.html | 18 +++---- .../src/main/webapp/partials/poll-popupChoice.html | 6 +-- .../src/main/webapp/partials/poll-result.html | 2 +- 16 files changed, 105 insertions(+), 104 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.