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 28734823c3b924c077186c2b641a5add66a4e99d Merge: 51bd8e3 1fef1e3 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Nov 7 17:20:27 2014 +0100 Merge branch 'feature/6011-6057-60058-documents-management' into develop coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 12 ++ coselmar-persistence/pom.xml | 5 + .../src/main/xmi/coselmar-model.properties | 1 + .../src/main/xmi/coselmar-model.zargo | Bin 4041 -> 4731 bytes .../src/main/xmi/coselmar-model.zargo~ | 0 coselmar-persistence/src/main/xmi/coselmar.zargo~ | Bin 3953 -> 0 bytes coselmar-rest/pom.xml | 13 ++ .../fr/ifremer/coselmar/beans/DocumentBean.java | 24 +++- .../coselmar/converter/BeanEntityConverter.java | 25 ++++ .../services/CoselmarWebServiceSupport.java | 23 +++- .../services/DefaultCoselmarServicesContext.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 139 ++++++++++++++++++--- coselmar-rest/src/main/resources/mapping | 1 + .../src/main/webapp/js/coselmar-controllers.js | 39 ++++-- .../src/main/webapp/js/coselmar-services.js | 36 +++++- coselmar-ui/src/main/webapp/views/document.html | 38 +++++- coselmar-ui/src/main/webapp/views/documents.html | 39 +++--- coselmar-ui/src/main/webapp/views/newdocument.html | 31 +++-- pom.xml | 32 ++++- 19 files changed, 391 insertions(+), 69 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.