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 395eb60 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 0865a71 refs-60 #7911 add citation in document - persistence & services part new c02daaf fixes #7911 add citation in documents new 5ec2cbc Merge branch 'feature/7911-add-citations-field-on-document' into develop The 3 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 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 commit c02daaf159f6df6352758ffc1a3bd116b91f1294 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 18 19:17:51 2016 +0100 fixes #7911 add citation in documents commit 0865a71a454e4a386a0c33a046e346a8526b4a9d Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 18 18:38:11 2016 +0100 refs-60 #7911 add citation in document - persistence & services part Summary of changes: ...=> V1_4_0_1__7911_add_citation_in_documents.sql} | 13 +------------ .../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, 73 insertions(+), 25 deletions(-) copy coselmar-persistence/src/main/resources/db/migration/{V1_2_0_1__7867_add_list_links_in_projects.sql => V1_4_0_1__7911_add_citation_in_documents.sql} (68%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.