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 deec9511dae838e74f084e4eb7ddc45b2d32c073 Merge: 4d9dbea c93c8b0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jun 25 17:19:45 2014 +0200 Merge branch 'feature/addBuilder' into develop pollen-ui-angular/.bowerrc | 4 + pollen-ui-angular/.gitignore | 4 +- pollen-ui-angular/bower.json | 23 ++ pollen-ui-angular/pom.xml | 25 ++ pollen-ui-angular/src/main/webapp/i18n/en.js | 3 +- pollen-ui-angular/src/main/webapp/index.html | 70 +++-- pollen-ui-angular/src/main/webapp/js/app.js | 348 +-------------------- .../src/main/webapp/js/controllers/pollCtrl.js | 121 +++++-- .../src/main/webapp/js/{app.js => directives.js} | 119 +++---- .../src/main/webapp/partials/inline-poll.html | 6 +- .../main/webapp/partials/poll-listParticipant.html | 28 +- .../src/main/webapp/partials/poll-poll.html | 2 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll-result.html | 2 +- .../src/main/webapp/partials/poll.html | 6 +- 15 files changed, 274 insertions(+), 489 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.