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 066c248050915e0b2fba324996d17de73b95def3 Merge: e699210 d6e133b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 11:57:08 2014 +0200 Merge branch 'feature/dateTimePicker' into develop pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/index.html | 6 ++ .../src/main/webapp/js/controllers/pollCtrl.js | 5 +- pollen-ui-angular/src/main/webapp/js/directives.js | 84 ++++++++++++++++++++++ .../src/main/webapp/partials/dateTimePicker.html | 6 ++ .../src/main/webapp/partials/inline-poll.html | 7 +- .../src/main/webapp/partials/poll-popupChoice.html | 7 +- .../src/main/webapp/partials/poll-settings.html | 61 +++++++--------- 8 files changed, 130 insertions(+), 49 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.