This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 77569dc fixes #1088 remove invalid date message adds 4fa505d separate differente form in user profile page adds 6f8d6e6 add view Profile new beb223b fixes #1065 new 850b979 change icon delete The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 850b9795aa67e5ec6c3e2194ae21570fac4bbc8e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:43:42 2014 +0200 change icon delete commit beb223be8083c4c2c25cf8273f9b371642d678c5 Merge: 77569dc 6f8d6e6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:32:58 2014 +0200 fixes #1065 Merge branch 'feature/1065-editUserPage' into develop Conflicts: pollen-ui-angular/src/main/webapp/i18n/en.js pollen-ui-angular/src/main/webapp/i18n/fr.js Summary of changes: 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(-) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-editProfile.html} (56%) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-password.html} (67%) create mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.