This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit 008c8021dcd3ac259d2a4f5eb086be868fd675c5 Merge: e9a5d00 01fdb54 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jun 7 17:09:30 2017 +0200 Merge branch 'feature/9206-upload-validation-zip-documents' into develop coselmar-rest/pom.xml | 4 - .../fr/ifremer/coselmar/beans/DocumentBean.java | 11 +- .../coselmar/beans/DocumentImportModel.java | 50 +++ .../java/fr/ifremer/coselmar/beans/FileInfos.java | 35 ++ .../beans/MassiveDocumentsImportResult.java | 51 +++ .../coselmar/converter/BeanEntityConverter.java | 4 +- .../services/CoselmarWebServiceSupport.java | 8 +- .../coselmar/services/indexation/TikaUtils.java | 5 + .../coselmar/services/v1/AdminWebService.java | 44 +-- .../coselmar/services/v1/DocumentsWebService.java | 419 ++++++++++++++++----- coselmar-rest/src/main/resources/mapping | 1 + .../services/v1/DocumentsWebServiceTest.java | 124 ++++++ coselmar-rest/src/test/resources/documents.zip | Bin 0 -> 151809 bytes .../src/test/resources/documents_errors.zip | Bin 0 -> 87774 bytes coselmar-ui/src/main/webapp/i18n/en.js | 31 ++ coselmar-ui/src/main/webapp/i18n/fr.js | 32 ++ .../src/main/webapp/js/coselmar-admin-services.js | 18 + .../src/main/webapp/js/coselmar-controllers.js | 20 +- .../src/main/webapp/views/admin/admintools.html | 70 +++- 19 files changed, 793 insertions(+), 134 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.