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

[pollen] branch develop updated (2c020bc -> 59a5ece)
by chorem.org scm 18 Aug '14

18 Aug '14

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 2c020bc add group result, improve UI with group result new 59a5ece add translate 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 59a5eceafabf4ef8f48048ed491a353f0acc05e9 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 18 17:24:52 2014 +0200 add translate Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 6 ++++++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 10 +++++----- 2 files changed, 11 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 (edd65be -> 2c020bc)
by chorem.org scm 18 Aug '14

18 Aug '14

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 edd65be optimize import new 2c020bc add group result, improve UI with group result 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 2c020bcaa7b8eb4e519ee2188d7fb99858cc4e37 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Aug 18 17:03:09 2014 +0200 add group result, improve UI with group result Summary of changes: .../services/bean/GroupVoteCountingResultBean.java | 16 ++++- ...tBean.java => VoteCountingGroupResultBean.java} | 31 ++++++++- .../services/bean/VoteCountingResultBean.java | 11 +++ .../services/service/VoteCountingService.java | 3 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 80 +++++++++++++++------- pollen-ui-angular/src/main/webapp/js/services.js | 4 ++ .../src/main/webapp/partials/poll-result.html | 42 +++++++++++- .../pollen/votecounting/model/GroupOfVoter.java | 1 + .../votecounting/model/VoteCountingResult.java | 10 +++ 10 files changed, 170 insertions(+), 34 deletions(-) copy pollen-services/src/main/java/org/chorem/pollen/services/bean/{VoteCountingResultBean.java => VoteCountingGroupResultBean.java} (70%) -- 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 deleted (was d647c8e)
by chorem.org scm 18 Aug '14

18 Aug '14

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 was d647c8e add rest error message. Add information message when loading of a page 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 (96c26b4 -> edd65be)
by chorem.org scm 14 Aug '14

14 Aug '14

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 96c26b4 add mainResult for group vote counting result new edd65be optimize import 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 edd65be6417b4e69a37b46e432d6c493c16c30aa Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 18:12:04 2014 +0200 optimize import Summary of changes: .../org/chorem/pollen/services/bean/GroupVoteCountingResultBean.java | 4 ---- 1 file changed, 4 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 (297c9b9 -> 96c26b4)
by chorem.org scm 14 Aug '14

14 Aug '14

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 297c9b9 fix test new 96c26b4 add mainResult for group vote counting result 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 96c26b4043f3fd6290621c0666db43e20c3d2ea5 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Thu Aug 14 18:00:10 2014 +0200 add mainResult for group vote counting result Summary of changes: .../services/bean/GroupVoteCountingResultBean.java | 17 +++++++++++++++-- 1 file changed, 15 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 develop updated (f36b6f7 -> 297c9b9)
by chorem.org scm 14 Aug '14

14 Aug '14

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 14 Aug '14

14 Aug '14

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 14 Aug '14

14 Aug '14

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 14 Aug '14

14 Aug '14

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 14 Aug '14

14 Aug '14

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