This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 166496f3b3eb0da9174658847cf5e4f4571a9e35 Merge: b6a809a c8a14d8 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Nov 25 17:59:52 2014 +0100 Merge branch 'feature/6014-modify-user' into develop .../java/fr/ifremer/coselmar/beans/UserBean.java | 9 + .../fr/ifremer/coselmar/beans/UserWebToken.java | 88 ++++++++++ .../services/CoselmarWebServiceSupport.java | 41 +++++ .../services/errors/UnauthorizedException.java | 11 ++ .../coselmar/services/v1/UsersWebService.java | 194 +++++++++++++++++++-- coselmar-rest/src/main/resources/mapping | 3 +- coselmar-ui/src/main/webapp/index.html | 4 +- .../src/main/webapp/js/coselmar-controllers.js | 30 +++- .../src/main/webapp/js/coselmar-user-services.js | 26 ++- coselmar-ui/src/main/webapp/js/coselmar.js | 2 +- .../src/main/webapp/views/users/edituser.html | 94 ++++++++++ .../src/main/webapp/views/users/newuser.html | 61 +------ coselmar-ui/src/main/webapp/views/users/user.html | 14 +- coselmar-ui/src/main/webapp/views/users/users.html | 6 +- 14 files changed, 494 insertions(+), 89 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.