This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 51bd8e3 Merge branch 'feature/single-page-ui' into develop adds c07e607 first step of document creation : document metadata adds d0da34f improve document metadata save adds 3de9b62 add document file upload during document creation adds afe0fae little change on new document page adds 01573b0 prepare services for document download and delete adds 284a15b document detail page adds 1fef1e3 complete Document view page & fix bundle module new 2873482 Merge branch 'feature/6011-6057-60058-documents-management' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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 Summary of changes: 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(-) delete mode 100644 coselmar-persistence/src/main/xmi/coselmar-model.zargo~ delete mode 100644 coselmar-persistence/src/main/xmi/coselmar.zargo~ create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.