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 5cfefb8 Improve directive auto-save adds b786236 Implement method to find all invited poll adds 0077c6b add permission for resticted poll when user is connected adds 43fe236 Add PollenPrincipal in VoterListMember, check permission for restricted poll. adds 260c459 create link with VoterListMember and PollenUser, create permission for VoterListMember adds 9f045ec no bouble vote in poll restricted adds 3838769 add security for vote visibility, review comment visibility adds aa9fcff add button save in all create poll page, fix label-block, improve UI adds 76332cd fix import favoriteList in voterList adds b9687a3 fix import favoriteList in existing voterList adds ea88e76 fix link voterListMember and pollenUser when import favoriteList adds 52a6ea2 fix route in edit poll, fix style title in poll settings adds be365f5 Add getNewVote in rest-api and improve it in service adds 8694ab2 get voterId and voterListMemberId for new vote adds 2e4da27 redirect if not admin in user list, fix edit vote adds c6d0d16 redirect to Retricted tab if error in voterList new 49732fd Merge branch 'feature/permissionPollRestricted' 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 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 Summary of changes: .../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>.