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 354d32b16acc61e6116f1ed2894b43b18c628da9 Merge: af95052 850b979 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Aug 29 12:22:43 2014 +0200 Merge branch 'develop' of https://git.chorem.org/pollen into develop pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +- .../src/main/webapp/js/controllers/userCtrl.js | 18 +++-- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-link.html | 2 +- .../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/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 | 26 ++++++ .../src/main/webapp/partials/user-edit.html | 94 ++-------------------- 16 files changed, 69 insertions(+), 192 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.