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 2ae6ffac13d650ca6af0bcb2fadd7babb1102a83 Merge: 43e514c 0667fa1 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 5 11:38:55 2015 +0100 Fixes #6515 Merge branch 'feature/6515-restrected-access-on-document' into develop .../persistence/entity/DocumentTopiaDao.java | 13 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 19 ++ .../services/CoselmarWebServiceSupport.java | 77 ++++++++- .../coselmar/services/v1/DocumentsWebService.java | 192 ++++++++++++++++----- .../coselmar/services/v1/QuestionsWebService.java | 83 +++++++-- .../coselmar/services/v1/UsersWebService.java | 46 +++++ coselmar-rest/src/main/resources/mapping | 1 + coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/coselmar-controllers.js | 71 +++++++- .../main/webapp/js/coselmar-questions-services.js | 2 - .../src/main/webapp/js/coselmar-services.js | 7 + .../main/webapp/views/documents/editDocument.html | 28 ++- .../main/webapp/views/documents/newdocument.html | 18 +- 14 files changed, 484 insertions(+), 75 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.