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

[pollen] branch feature/createPreviewRessource updated (4a68b5f -> d647c8e)
by chorem.org scm Aug. 14, 2014

Aug. 14, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/createPreviewRessource in repository pollen. See http://git.chorem.org/pollen.git from 4a68b5f add voteCountingType into poll info new d647c8e add rest error message. Add information message when loading of a page 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 d647c8e441a68c9a613b6dba53174e8788c2055d Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 12:41:45 2014 +0200 add rest error message. Add information message when loading of a page Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 5 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 5 ++- pollen-ui-angular/src/main/webapp/js/app.js | 46 +++++++++++++++++++++- .../src/main/webapp/js/controllers/alertCtrl.js | 16 ++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 32 ++++++++------- pollen-ui-angular/src/main/webapp/less/style.less | 4 +- .../src/main/webapp/partials/poll-info.html | 4 +- .../src/main/webapp/partials/poll.html | 2 +- 8 files changed, 91 insertions(+), 23 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/createPreviewRessource updated (e55300d -> 4a68b5f)
by chorem.org scm Aug. 13, 2014

Aug. 13, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/createPreviewRessource in repository pollen. See http://git.chorem.org/pollen.git from e55300d replace glyphicon by fa new 4a68b5f add voteCountingType into 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 4a68b5f111eb7a1338d7f95baa9df44e938c929c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 13 17:53:42 2014 +0200 add voteCountingType into poll info Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-info.html | 5 +++++ pollen-ui-angular/src/main/webapp/partials/poll-settings.html | 2 +- 5 files changed, 9 insertions(+), 2 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/createPreviewRessource updated (10984f3 -> e55300d)
by chorem.org scm Aug. 13, 2014

Aug. 13, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/createPreviewRessource in repository pollen. See http://git.chorem.org/pollen.git from 10984f3 Set good header for preview, and improve getPreviewResource new 7cd7ff9 remove spin.js, add font-awesome. add icon for no image picture new e55300d replace glyphicon by fa 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 e55300d45d9a80cf1bf791789152c58a69bfc2e7 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 13 17:01:22 2014 +0200 replace glyphicon by fa commit 7cd7ff9dc920b320551367264a558a2ee7732779 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 13 14:55:59 2014 +0200 remove spin.js, add font-awesome. add icon for no image picture Summary of changes: pollen-ui-angular/bower.json | 4 +- pollen-ui-angular/src/main/webapp/index.html | 6 +-- .../src/main/webapp/js/controllers/alertCtrl.js | 8 +-- pollen-ui-angular/src/main/webapp/js/directives.js | 57 +++++++++++++++----- pollen-ui-angular/src/main/webapp/less/style.less | 30 +++++------ .../src/main/webapp/less/variables.less | 15 +++++- .../src/main/webapp/partials/alerts.html | 4 +- .../src/main/webapp/partials/big-poll.html | 2 +- .../src/main/webapp/partials/dateTimePicker.html | 4 +- .../main/webapp/partials/favoriteList-edit.html | 8 +-- .../main/webapp/partials/favoriteList-list.html | 2 +- .../src/main/webapp/partials/home.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 14 ++--- .../src/main/webapp/partials/poll-comment.html | 16 +++--- .../src/main/webapp/partials/poll-link.html | 18 +++---- .../src/main/webapp/partials/poll-list.html | 8 +-- .../main/webapp/partials/poll-listParticipant.html | 12 ++--- .../src/main/webapp/partials/poll-popupChoice.html | 6 +-- .../src/main/webapp/partials/poll-settings.html | 2 +- .../src/main/webapp/partials/poll.html | 2 +- .../src/main/webapp/partials/printResource.html | 16 +++++- .../src/main/webapp/partials/user-admin-list.html | 6 +-- .../src/main/webapp/partials/user-edit.html | 62 +++++++++------------- .../src/main/webapp/partials/user-login.html | 2 +- .../main/webapp/partials/user-lostPassword.html | 2 +- .../src/main/webapp/partials/user-register.html | 4 +- 26 files changed, 176 insertions(+), 138 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/createPreviewRessource updated (ed60d64 -> 10984f3)
by chorem.org scm Aug. 13, 2014

Aug. 13, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/createPreviewRessource in repository pollen. See http://git.chorem.org/pollen.git from ed60d64 remove debug code new 10984f3 Set good header for preview, and improve getPreviewResource 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 10984f3ba7203ed4c89e747dd6e5df31bbbea928 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Aug 13 11:15:41 2014 +0200 Set good header for preview, and improve getPreviewResource Summary of changes: .../pollen/rest/api/v1/PollenResourceApi.java | 44 ++++++++++------------ .../src/main/webapp/js/controllers/pollCtrl.js | 4 +- pollen-ui-angular/src/main/webapp/js/directives.js | 3 +- .../src/main/webapp/partials/printResource.html | 2 +- 4 files changed, 24 insertions(+), 29 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/createPreviewRessource created (now ed60d64)
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 feature/createPreviewRessource in repository pollen. See http://git.chorem.org/pollen.git at ed60d64 remove debug code This branch includes the following new commits: new 58fc68e resize picture for preview new d067e68 mapping accept name of ressource at the end of url new 590bf52 improve printResource new eefa9e6 add default preview if no image resource new ed60d64 remove debug code The 5 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 ed60d64a8be38ac8827e08970cb66d312d5c2324 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 18:35:17 2014 +0200 remove debug code commit eefa9e6a97ce948e992f99c3681b09b6f633a867 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 18:32:21 2014 +0200 add default preview if no image resource commit d067e6873f036a75f2994ff933ae4856c7513ed3 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 17:48:16 2014 +0200 mapping accept name of ressource at the end of url commit 590bf52169a854466da50924c122deb119ea566c Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 17:49:15 2014 +0200 improve printResource commit 58fc68e808b675a30276298e507fdceef0bd10e0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Aug 12 17:47:22 2014 +0200 resize picture for preview -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 5

[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