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 04caf751191aa4d5e6aa1b66519dcf41404a10d1 Merge: 980786d a02e287 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 3 16:49:02 2014 +0200 Merge branch 'feature/voteCountingApi' into develop .../pollen/rest/api/v1/VoteCountingTypeApi.java | 23 ++++ pollen-rest-api/src/main/resources/mapping | 5 + .../pollen/services/bean/VoteCountingTypeBean.java | 75 ++++++++++++ .../services/service/VoteCountingTypeService.java | 67 +++++++++++ .../src/main/webapp/js/controllers/localeCtrl.js | 3 +- .../src/main/webapp/js/controllers/pollCtrl.js | 126 +++++++++++++-------- pollen-ui-angular/src/main/webapp/js/services.js | 9 ++ .../src/main/webapp/partials/inline-poll.html | 4 +- .../src/main/webapp/partials/poll-settings.html | 12 +- 9 files changed, 265 insertions(+), 59 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.