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@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@chorem.org>.