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

[pollen] branch develop updated (f36b6f7 -> 297c9b9)
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 develop in repository pollen. See http://git.chorem.org/pollen.git from f36b6f7 check if conf.restURL is set else print the error new 297c9b9 fix test 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 297c9b9143d6be0952ed224b0a090e273418ecb0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 16:37:38 2014 +0200 fix test Summary of changes: pollen-ui-angular/src/test/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 (33e6fc8 -> f36b6f7)
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 develop in repository pollen. See http://git.chorem.org/pollen.git from 33e6fc8 fix class form in user edit, edit template info-error new e8fe104 add appendClass in directive infoError new f36b6f7 check if conf.restURL is set else print the error 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 f36b6f724313b0cd404245e12e0606a9c40dc0cb Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 16:24:09 2014 +0200 check if conf.restURL is set else print the error commit e8fe1048b8fd49dbb5e88481f2ffc0be5e659a80 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 16:23:27 2014 +0200 add appendClass in directive infoError Summary of changes: pollen-ui-angular/src/main/webapp/index.html | 75 +++++++++++----------- pollen-ui-angular/src/main/webapp/js/app.js | 12 ++++ .../webapp/js/{conf.js.exemple => conf.js.example} | 2 +- pollen-ui-angular/src/main/webapp/js/directives.js | 17 +++-- .../src/main/webapp/less/variables.less | 4 ++ .../src/main/webapp/partials/inline-poll.html | 6 +- .../src/main/webapp/partials/poll-comment.html | 4 +- .../main/webapp/partials/poll-listParticipant.html | 2 +- .../src/main/webapp/partials/poll-poll.html | 2 +- .../src/main/webapp/partials/poll-settings.html | 22 +++---- .../src/main/webapp/partials/user-edit.html | 8 +-- .../src/main/webapp/partials/user-login.html | 2 +- .../main/webapp/partials/user-lostPassword.html | 2 +- .../src/main/webapp/partials/user-register.html | 2 +- 14 files changed, 90 insertions(+), 70 deletions(-) rename pollen-ui-angular/src/main/webapp/js/{conf.js.exemple => conf.js.example} (95%) -- 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 (11b3a83 -> 33e6fc8)
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 develop in repository pollen. See http://git.chorem.org/pollen.git from 11b3a83 fix test new 6f740b6 remove debug code new 33e6fc8 fix class form in user edit, edit template info-error 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 33e6fc8473f1059430e7064f932e13197a686830 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 14:36:48 2014 +0200 fix class form in user edit, edit template info-error commit 6f740b63a9f6a97c7a28c59829c7b2a526f33b75 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 14:25:27 2014 +0200 remove debug code Summary of changes: pollen-ui-angular/src/main/webapp/js/controllers/alertCtrl.js | 2 -- pollen-ui-angular/src/main/webapp/js/directives.js | 4 ++-- pollen-ui-angular/src/main/webapp/partials/user-edit.html | 4 ++-- 3 files changed, 4 insertions(+), 6 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 (8f214cc -> 11b3a83)
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 develop in repository pollen. See http://git.chorem.org/pollen.git from 8f214cc Merge branch 'feature/createPreviewRessource' into develop new 11b3a83 fix test 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 11b3a8375c7974d3f690236654993861072fbc06 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 14:03:09 2014 +0200 fix test Summary of changes: .../src/test/unit/pollControllersTest.js | 33 +++++++++++----------- 1 file changed, 17 insertions(+), 16 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 (aa2f89f -> 8f214cc)
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 develop in repository pollen. See http://git.chorem.org/pollen.git from aa2f89f Server verify the limitedVote if nbChoice < maxChoiceNumber adds 58fc68e resize picture for preview adds d067e68 mapping accept name of ressource at the end of url adds 590bf52 improve printResource adds eefa9e6 add default preview if no image resource adds ed60d64 remove debug code adds 10984f3 Set good header for preview, and improve getPreviewResource adds 7cd7ff9 remove spin.js, add font-awesome. add icon for no image picture adds e55300d replace glyphicon by fa adds 4a68b5f add voteCountingType into poll info adds d647c8e add rest error message. Add information message when loading of a page new 8f214cc Merge branch 'feature/createPreviewRessource' 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 8f214cc31bf559b26ecb231a9f04d16e29cc8d73 Merge: aa2f89f d647c8e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 12:45:15 2014 +0200 Merge branch 'feature/createPreviewRessource' into develop Summary of changes: pollen-rest-api/pom.xml | 1 + .../pollen/rest/api/v1/PollenResourceApi.java | 49 +++++++++++-- pollen-rest-api/src/main/resources/default.jpg | Bin 0 -> 8374 bytes pollen-rest-api/src/main/resources/mapping | 4 ++ pollen-ui-angular/bower.json | 4 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +- pollen-ui-angular/src/main/webapp/index.html | 6 +- pollen-ui-angular/src/main/webapp/js/app.js | 46 +++++++++++- .../src/main/webapp/js/controllers/alertCtrl.js | 24 +++++-- .../src/main/webapp/js/controllers/pollCtrl.js | 36 +++++----- pollen-ui-angular/src/main/webapp/js/directives.js | 77 +++++++++++++++++---- pollen-ui-angular/src/main/webapp/less/style.less | 64 +++++++---------- .../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 | 16 ++--- .../src/main/webapp/partials/poll-comment.html | 16 ++--- .../src/main/webapp/partials/poll-info.html | 7 +- .../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 | 4 +- .../src/main/webapp/partials/poll.html | 4 +- .../src/main/webapp/partials/printResource.html | 19 ++++- .../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 +- 35 files changed, 354 insertions(+), 194 deletions(-) create mode 100644 pollen-rest-api/src/main/resources/default.jpg -- 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 (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