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 49732fd420f7a7d7624ce89bce4f8a9eed288937 Merge: 5cfefb8 c6d0d16 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 6 17:04:42 2014 +0200 Merge branch 'feature/permissionPollRestricted' into develop .../pollen/persistence/entity/PollTopiaDao.java | 46 +++++- pollen-persistence/src/main/xmi/pollen.zargo | Bin 20479 -> 20954 bytes .../org/chorem/pollen/rest/api/v1/VoteApi.java | 4 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 2 +- pollen-rest-api/src/main/resources/mapping | 4 +- .../org/chorem/pollen/services/bean/PollBean.java | 9 ++ .../pollen/services/bean/VoterListMemberBean.java | 16 +- .../pollen/services/service/PollService.java | 2 + .../pollen/services/service/VoteService.java | 29 ++-- .../pollen/services/service/VoterListService.java | 54 +++++-- .../services/service/security/SecurityService.java | 173 ++++++++++++++------- pollen-ui-angular/src/main/webapp/js/app.js | 15 +- .../src/main/webapp/js/controllers/pollCtrl.js | 95 ++++++----- .../src/main/webapp/js/controllers/userCtrl.js | 9 +- pollen-ui-angular/src/main/webapp/js/services.js | 4 + pollen-ui-angular/src/main/webapp/less/style.less | 170 ++++++++++---------- .../src/main/webapp/less/variables.less | 2 +- .../src/main/webapp/partials/inline-poll.html | 28 ++-- .../src/main/webapp/partials/poll-poll.html | 5 - .../src/main/webapp/partials/poll.html | 10 +- 20 files changed, 427 insertions(+), 250 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.