- Pollen-commits - mailman.cloud.codelutin.com

[pollen] branch develop updated (49732fd -> 90e6c7c)
by chorem.org scm Aug. 6, 2014

Aug. 6, 2014

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 49732fd Merge branch 'feature/permissionPollRestricted' into develop new eb2bdbe set weight from voter list member if possible new 90e6c7c add form creator information in poll-settings The 2 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 90e6c7cdf21db0852a34230159b4077c8625e9c1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 18:24:57 2014 +0200 add form creator information in poll-settings commit eb2bdbec1c7741c20630aa560808c028356662d5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 17:42:12 2014 +0200 set weight from voter list member if possible Summary of changes: .../org/chorem/pollen/services/service/VoteService.java | 4 +++- pollen-ui-angular/src/main/webapp/i18n/en.js | 4 ++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 4 ++++ pollen-ui-angular/src/main/webapp/less/style.less | 3 +++ pollen-ui-angular/src/main/webapp/less/variables.less | 1 + .../src/main/webapp/partials/poll-settings.html | 17 +++++++++++++++++ 6 files changed, 32 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/permissionPollRestricted deleted (was c6d0d16)
by chorem.org scm Aug. 6, 2014

Aug. 6, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git was c6d0d16 redirect to Retricted tab if error in voterList The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch develop updated (5cfefb8 -> 49732fd)
by chorem.org scm Aug. 6, 2014

Aug. 6, 2014

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(a)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(a)chorem.org>.

1 1

[pollen] branch feature/permissionPollRestricted updated (2e4da27 -> c6d0d16)
by chorem.org scm Aug. 6, 2014

Aug. 6, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git from 2e4da27 redirect if not admin in user list, fix edit vote new c6d0d16 redirect to Retricted tab if error in voterList 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 c6d0d168a95343a8a59779c2282835b054cc4826 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 17:01:03 2014 +0200 redirect to Retricted tab if error in voterList Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 3 +++ 1 file changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/permissionPollRestricted updated (52a6ea2 -> 2e4da27)
by chorem.org scm Aug. 6, 2014

Aug. 6, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git from 52a6ea2 fix route in edit poll, fix style title in poll settings new be365f5 Add getNewVote in rest-api and improve it in service new 8694ab2 get voterId and voterListMemberId for new vote new 2e4da27 redirect if not admin in user list, fix edit vote The 3 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 2e4da276dd2a94e2ed376da42a611b7d51cc88ba Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 16:24:27 2014 +0200 redirect if not admin in user list, fix edit vote commit 8694ab2ab9b3419a1ae0b5695b501c980be2e2fd Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 16:00:06 2014 +0200 get voterId and voterListMemberId for new vote commit be365f54f47c040a6a5fcae2503561aaacdbebff Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 14:54:37 2014 +0200 Add getNewVote in rest-api and improve it in service Summary of changes: .../org/chorem/pollen/rest/api/v1/VoteApi.java | 4 +-- pollen-rest-api/src/main/resources/mapping | 2 +- .../pollen/services/service/VoteService.java | 20 ++++++------ pollen-ui-angular/src/main/webapp/js/app.js | 5 +-- .../src/main/webapp/js/controllers/pollCtrl.js | 36 +++++++++------------- .../src/main/webapp/js/controllers/userCtrl.js | 9 ++++-- pollen-ui-angular/src/main/webapp/js/services.js | 4 +++ 7 files changed, 41 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

[pollen] branch feature/permissionPollRestricted updated (aa9fcff -> 52a6ea2)
by chorem.org scm Aug. 6, 2014

Aug. 6, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git from aa9fcff add button save in all create poll page, fix label-block, improve UI new 76332cd fix import favoriteList in voterList new b9687a3 fix import favoriteList in existing voterList new ea88e76 fix link voterListMember and pollenUser when import favoriteList new 52a6ea2 fix route in edit poll, fix style title in poll settings The 4 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 52a6ea27aeab45fbf7256d14509858965f4a82ee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 11:49:04 2014 +0200 fix route in edit poll, fix style title in poll settings commit ea88e765a2c8165d2e2259a61c0bdf367c90f8a0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 11:47:16 2014 +0200 fix link voterListMember and pollenUser when import favoriteList commit b9687a3a575414df5bc3fe1290978a6d570eb9e1 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 11:46:22 2014 +0200 fix import favoriteList in existing voterList commit 76332cd6e6d64cec2aa58dc647fbeab33cc1d56a Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 6 10:25:50 2014 +0200 fix import favoriteList in voterList Summary of changes: .../org/chorem/pollen/rest/api/v1/VoterListApi.java | 2 +- pollen-rest-api/src/main/resources/mapping | 2 +- .../pollen/services/bean/VoterListMemberBean.java | 11 ++++++----- .../pollen/services/service/VoterListService.java | 17 +++++++++-------- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 8 ++++---- pollen-ui-angular/src/main/webapp/less/style.less | 12 +++++++----- pollen-ui-angular/src/main/webapp/partials/poll.html | 4 ++-- 8 files changed, 31 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

[pollen] branch develop updated (da5356b -> 5cfefb8)
by chorem.org scm Aug. 5, 2014

Aug. 5, 2014

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 da5356b fix UI in form new 5cfefb8 Improve directive auto-save 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 5cfefb86ca1a22cb0fe358579035d8774320f7c6 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 5 18:19:06 2014 +0200 Improve directive auto-save Summary of changes: pollen-ui-angular/src/main/webapp/js/directives.js | 53 ++++++++++++++++------ 1 file changed, 39 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/permissionPollRestricted updated (260c459 -> aa9fcff)
by chorem.org scm Aug. 5, 2014

Aug. 5, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git from 260c459 create link with VoterListMember and PollenUser, create permission for VoterListMember new 9f045ec no bouble vote in poll restricted new 3838769 add security for vote visibility, review comment visibility new aa9fcff add button save in all create poll page, fix label-block, improve UI The 3 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 aa9fcffeafb46adede8348d04df289d1fe905b38 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 5 15:53:54 2014 +0200 add button save in all create poll page, fix label-block, improve UI commit 3838769200c66c5f4aac0384ae4cf8ed6c47874c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 5 15:52:17 2014 +0200 add security for vote visibility, review comment visibility commit 9f045ec0ec348c190f0b3e18fefab20aef202f21 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 5 11:58:25 2014 +0200 no bouble vote in poll restricted Summary of changes: .../org/chorem/pollen/services/bean/PollBean.java | 9 ++ .../pollen/services/service/PollService.java | 2 + .../pollen/services/service/VoteService.java | 9 +- .../services/service/security/SecurityService.java | 98 ++++++++---- .../src/main/webapp/js/controllers/pollCtrl.js | 29 ++-- pollen-ui-angular/src/main/webapp/less/style.less | 168 +++++++++++---------- .../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 | 6 +- 10 files changed, 214 insertions(+), 142 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3

[pollen] branch feature/permissionPollRestricted updated (43fe236 -> 260c459)
by chorem.org scm Aug. 5, 2014

Aug. 5, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/permissionPollRestricted in repository pollen. See http://git.chorem.org/pollen.git from 43fe236 Add PollenPrincipal in VoterListMember, check permission for restricted poll. new 260c459 create link with VoterListMember and PollenUser, create permission for VoterListMember 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 260c45932d66a41033366f68fed36ff5748e6690 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 5 10:41:11 2014 +0200 create link with VoterListMember and PollenUser, create permission for VoterListMember Summary of changes: .../pollen/services/bean/VoterListMemberBean.java | 9 ++++-- .../pollen/services/service/VoterListService.java | 32 ++++++++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch develop updated (1ff97ad -> da5356b)
by chorem.org scm Aug. 5, 2014

Aug. 5, 2014

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 1ff97ad use chorempom 1.2 new da5356b fix UI in form 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 da5356b17efff0f289be4333b1b3137c16a5c725 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 5 10:42:32 2014 +0200 fix UI in form Summary of changes: .../src/main/webapp/partials/user-lostPassword.html | 4 ++-- .../src/main/webapp/partials/user-register.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1