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 b789cd461e14f93efc0545fbf7c75ad4de39b101 Merge: 19ba20f b0a9c28 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 21 18:16:07 2015 +0100 fixes #6435 Merge branch 'feature/6435-modify-document' into develop .../fr/ifremer/coselmar/beans/DocumentBean.java | 16 ++ .../coselmar/services/v1/DocumentsWebService.java | 84 +++++++- .../src/main/webapp/js/coselmar-controllers.js | 82 +++++++- .../src/main/webapp/js/coselmar-services.js | 7 +- .../src/main/webapp/views/documents/document.html | 82 +------- .../main/webapp/views/documents/editDocument.html | 227 +++++++++++++++++++++ .../documents/{document.html => viewDocument.html} | 41 ++-- 7 files changed, 421 insertions(+), 118 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.