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 86c5e1d5ae92235438395bf0a324504aebc34789 Merge: 90b17a3 81a150c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:34:12 2014 +0200 Merge branch 'feature/homePage' into develop pollen-ui-angular/src/main/webapp/i18n/en.js | 3 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/index.html | 14 ++++ .../src/main/webapp/js/controllers/mainCtrl.js | 9 ++- .../src/main/webapp/js/controllers/pollCtrl.js | 8 +-- .../src/main/webapp/js/controllers/userCtrl.js | 4 +- pollen-ui-angular/src/main/webapp/less/style.less | 77 ++++++++++++++-------- .../src/main/webapp/partials/home.html | 16 ++++- .../src/main/webapp/partials/poll-link.html | 7 -- .../src/main/webapp/partials/user-admin-list.html | 3 +- 10 files changed, 95 insertions(+), 47 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.