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 5ec2cbc3532c9343225f7cc391e9a1a55a1649d3 Merge: 395eb60 c02daaf Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 18 19:17:57 2016 +0100 Merge branch 'feature/7911-add-citations-field-on-document' into develop .../V1_4_0_1__7911_add_citation_in_documents.sql | 23 +++++++++++++++++++++ .../src/main/xmi/coselmar-model.properties | 1 + .../src/main/xmi/coselmar-model.zargo | Bin 10955 -> 11007 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 13 +++++++++++- .../ifremer/coselmar/beans/DocumentSearchBean.java | 4 ++-- .../coselmar/converter/BeanEntityConverter.java | 6 +++++- .../coselmar/services/v1/DocumentsWebService.java | 5 ++++- .../indexation/DocumentsIndexationServiceTest.java | 16 +++++++------- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../main/webapp/views/documents/editDocument.html | 11 ++++++++++ .../webapp/views/documents/modalDocumentEdit.html | 12 +++++++++++ .../main/webapp/views/documents/newdocument.html | 11 ++++++++++ .../main/webapp/views/documents/viewDocument.html | 4 ++++ 14 files changed, 95 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.