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

[pollen] branch develop updated (ba28395 -> aa2f89f)
by chorem.org scm Aug. 12, 2014

Aug. 12, 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 ba28395 update angular version to 1.2.21 new ae7b9d2 UI check the maxChoiceNumber for limitdVote in pollType Normal new aa2f89f Server verify the limitedVote if nbChoice < maxChoiceNumber 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 aa2f89f8de73c2af3fa2806f1f78309ab1b8da1f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 15:20:06 2014 +0200 Server verify the limitedVote if nbChoice < maxChoiceNumber commit ae7b9d2bf3e5f3978dc4b36c2facd12f505a6d56 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 12:10:59 2014 +0200 UI check the maxChoiceNumber for limitdVote in pollType Normal Summary of changes: .../services/service/VoteCountingService.java | 21 ++-- .../pollen/services/service/VoteService.java | 16 ++- .../i18n/pollen-services_en_GB.properties | 1 + .../i18n/pollen-services_fr_FR.properties | 3 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/controllers/pollCtrl.js | 120 ++++++++++++++------- .../src/main/webapp/partials/poll-info.html | 4 + .../src/main/webapp/partials/poll-settings.html | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- 10 files changed, 119 insertions(+), 52 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch develop updated (ede7312 -> ba28395)
by chorem.org scm Aug. 12, 2014

Aug. 12, 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 ede7312 print error in poll settings new ba28395 update angular version to 1.2.21 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 ba28395aefcddc7c665392b400222042e8810ae8 Author: Dralagen <dralagen(a)dralagen.fr> Date: Tue Aug 12 09:16:25 2014 +0200 update angular version to 1.2.21 Summary of changes: pollen-ui-angular/bower.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 (515309f -> ede7312)
by chorem.org scm Aug. 11, 2014

Aug. 11, 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 515309f translate poll-info new ede7312 print error in poll settings 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 ede73121bde3627bb426ef1f983bd0bc4a538d72 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 17:52:33 2014 +0200 print error in poll settings Summary of changes: .../pollen/services/service/PollService.java | 8 +- .../main/webapp/partials/poll-listParticipant.html | 5 +- .../src/main/webapp/partials/poll-settings.html | 169 +++++++++++++++------ 3 files changed, 132 insertions(+), 50 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 (5d56b2d -> 515309f)
by chorem.org scm Aug. 11, 2014

Aug. 11, 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 5d56b2d translate voterlist error messages, add somme test for VoterListService new 515309f translate poll-info 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 515309f442241fb13b3f2ca250c3662caf1ff63f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 16:14:28 2014 +0200 translate poll-info Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 11 +++++++++-- pollen-ui-angular/src/main/webapp/i18n/fr.js | 11 +++++++++-- pollen-ui-angular/src/main/webapp/partials/poll-info.html | 14 +++++++------- 3 files changed, 25 insertions(+), 11 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 (90e6c7c -> 5d56b2d)
by chorem.org scm Aug. 11, 2014

Aug. 11, 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 90e6c7c add form creator information in poll-settings new 118da7b upgrade bootstrap datetimepicker and use momentjs 2.8.1 new d3cb162 add information of poll in UI new 95b5038 update dateTimePicker new 057498f print info conflit between endChoiceDate and beginDate new 036512a stop event for popup editChoice, edit transition popup new 47eddd1 update style with new import from bootstrap for transition and opacity new 97c1cf9 remove unused parameter and add end statement new 53376be Merge branch 'feature/printPollInformation' into develop new d4bb26c PollService verify date new 2bdb75d translate VoteService error message new a8446d8 translate comment error message new 5d56b2d translate voterlist error messages, add somme test for VoterListService The 12 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 5d56b2d902e584b7e2252dc2b4dbf5ae3bedcb13 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 15:26:56 2014 +0200 translate voterlist error messages, add somme test for VoterListService commit a8446d8f171ade6292b8dcba9da502e33e219287 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 14:26:30 2014 +0200 translate comment error message commit 2bdb75d0936199c44d387ce3594695c90aa4c11f Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 14:20:43 2014 +0200 translate VoteService error message commit d4bb26cd5d176c63fe7ad7b9add4c8f89dafaed0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 13:42:27 2014 +0200 PollService verify date commit 53376bef11c0e990192b42c869b5e9099ee549c8 Merge: 90e6c7c 97c1cf9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 15:31:23 2014 +0200 Merge branch 'feature/printPollInformation' into develop commit 97c1cf9aa56dafb384f7bb153b31c82277f2a381 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 11 11:35:37 2014 +0200 remove unused parameter and add end statement commit 47eddd178662b86763fb408cecdb351697284cda Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 8 17:00:55 2014 +0200 update style with new import from bootstrap for transition and opacity commit 036512a2c647c1d7695b1edcc8fa16cca4cf2a39 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 8 16:55:31 2014 +0200 stop event for popup editChoice, edit transition popup commit 057498f4c8a8a2cb43e09f719e77d6f165155e61 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 8 16:08:40 2014 +0200 print info conflit between endChoiceDate and beginDate commit 95b50385033f0c9eb19945bc8f23c02e2cfa3cac Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Fri Aug 8 16:07:28 2014 +0200 update dateTimePicker commit d3cb162294cff9532d815c909675fc7e04c5e633 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 7 17:26:44 2014 +0200 add information of poll in UI commit 118da7b7f46d271c82f121952cb00f363b6dbecc Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 7 12:57:07 2014 +0200 upgrade bootstrap datetimepicker and use momentjs 2.8.1 Summary of changes: .../pollen/services/service/CommentService.java | 6 +- .../pollen/services/service/PollService.java | 56 +++++- .../services/service/VoteCountingService.java | 6 +- .../pollen/services/service/VoteService.java | 12 +- .../pollen/services/service/VoterListService.java | 27 ++- .../services/service/security/SecurityService.java | 5 +- .../i18n/pollen-services_en_GB.properties | 21 ++ .../i18n/pollen-services_fr_FR.properties | 21 ++ .../services/service/VoterListServiceTest.java | 74 ++++++- pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 6 +- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/conf.js.exemple | 3 +- .../src/main/webapp/js/controllers/alertCtrl.js | 14 +- .../main/webapp/js/controllers/favoriteListCtrl.js | 22 +-- .../src/main/webapp/js/controllers/localeCtrl.js | 6 +- .../src/main/webapp/js/controllers/mainCtrl.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 214 +++++++++++++-------- .../src/main/webapp/js/controllers/userCtrl.js | 30 +-- pollen-ui-angular/src/main/webapp/js/directives.js | 98 +++++----- pollen-ui-angular/src/main/webapp/js/services.js | 54 +++--- pollen-ui-angular/src/main/webapp/less/style.less | 73 +++++-- .../src/main/webapp/less/variables.less | 26 +-- .../src/main/webapp/partials/dateTimePicker.html | 6 +- .../src/main/webapp/partials/inline-poll.html | 10 +- .../src/main/webapp/partials/poll-info.html | 33 ++++ .../src/main/webapp/partials/poll-settings.html | 3 +- .../src/main/webapp/partials/poll.html | 2 + 28 files changed, 562 insertions(+), 273 deletions(-) create mode 100644 pollen-ui-angular/src/main/webapp/partials/poll-info.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 12

[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