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 924395d7384b36fa35eb4ea4f1e9043abdb17ae2 Merge: 993c889 ea8bffd Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jan 16 12:49:37 2015 +0100 Fixes #6438 Merge branch 'feature/6438-improve-user-management' into develop .../src/main/xmi/coselmar-model.zargo | Bin 10322 -> 10390 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 12 ++++- .../coselmar/converter/BeanEntityConverter.java | 3 +- .../coselmar/services/v1/DocumentsWebService.java | 54 ++++++++++++++++++++- coselmar-rest/src/main/resources/mapping | 3 +- coselmar-ui/src/main/webapp/index.html | 2 + .../src/main/webapp/js/coselmar-controllers.js | 50 ++++++++++--------- .../main/webapp/js/coselmar-questions-services.js | 14 ++---- .../src/main/webapp/js/coselmar-services.js | 45 +++++++++++++++-- .../src/main/webapp/js/coselmar-user-services.js | 13 ++--- coselmar-ui/src/main/webapp/js/coselmar.js | 3 ++ .../src/main/webapp/views/documents/document.html | 4 ++ coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- 14 files changed, 156 insertions(+), 51 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.