This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 53376bef11c0e990192b42c869b5e9099ee549c8 Merge: 90e6c7c 97c1cf9 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Aug 11 15:31:23 2014 +0200 Merge branch 'feature/printPollInformation' into develop 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 + 19 files changed, 376 insertions(+), 231 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.