This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from ee49fd5 anonymizeUser set vote to anonyme adds 3962d70 generate editVote permission and deleteVote permission for connected user or by url permission adds 7cadb32 fix all-delete-orphan when editVote adds 7b8c002 fix edit Choice : if error you can edit or delete the choice adds b43ea8c improve message with url for edit vote adds 0e8eb23 improve message with url for edit comment adds 587c4a0 improve message with url for edit poll adds 0778ebc add message with url for clone poll and change order alert adds 9f703a7 fix doublons when edit vote and add choice new 56797b3 Merge branch 'feature/editVote' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 56797b336136f5d15186d866e89055b979925e13 Merge: ee49fd5 9f703a7 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Jul 31 15:04:18 2014 +0200 Merge branch 'feature/editVote' into develop Summary of changes: .../pollen/services/service/VoteService.java | 57 +++++++++-------- .../services/service/security/SecurityService.java | 4 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 3 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/controllers/pollCtrl.js | 72 ++++++++++++++-------- .../src/main/webapp/partials/inline-poll.html | 14 ++--- .../src/main/webapp/partials/poll-list.html | 2 +- 7 files changed, 99 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.