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 613b614a5ba421c1a602e2c4c880fa68af83592f Merge: e5a1179 733e247 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:22:58 2014 +0200 Merge branch 'release/2.0-alpha-2' pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 6 +- pollen-services/pom.xml | 2 +- .../pollen/services/bean/PollenUserBean.java | 11 +++ pollen-ui-angular/bower.json | 4 +- pollen-ui-angular/pom.xml | 7 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 20 ++++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 94 ++++++++++--------- pollen-ui-angular/src/main/webapp/img/pollen.png | Bin 28557 -> 610 bytes pollen-ui-angular/src/main/webapp/index.html | 14 +-- .../src/main/webapp/js/conf.js.example | 2 +- .../src/main/webapp/js/controllers/alertCtrl.js | 100 ++++++++++++++++----- .../src/main/webapp/js/controllers/pollCtrl.js | 53 +++++++++-- .../src/main/webapp/js/controllers/userCtrl.js | 57 +++++++++--- pollen-ui-angular/src/main/webapp/js/directives.js | 8 +- pollen-ui-angular/src/main/webapp/less/style.less | 94 +++++++++++-------- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 10 +-- .../src/main/webapp/partials/poll-comment.html | 83 ++++++++++------- .../src/main/webapp/partials/poll-info.html | 4 +- .../src/main/webapp/partials/poll-link.html | 14 ++- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll.html | 20 ++--- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../{user-edit.html => user-edit-editProfile.html} | 47 +--------- .../{user-edit.html => user-edit-password.html} | 42 --------- .../webapp/partials/user-edit-viewProfile.html | 46 ++++++++++ .../src/main/webapp/partials/user-edit.html | 94 ++----------------- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 40 files changed, 489 insertions(+), 379 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.