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 166496f Merge branch 'feature/6014-modify-user' into develop new cf38c8d #6140 add new metadata in document entity new 1c77d64 #6140 manager document metadata in webservice new 673e11b #6140 add new metadata in document views new 3c42708 Merge branch 'feature/6140-update-document-metadata' into develop The 4 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 3c427089cc3e372a8036f43489eee22f2b79db8a Merge: 166496f 673e11b Author: Yannick Martel <martel@©odelutin.com> Date: Wed Nov 26 16:55:42 2014 +0100 Merge branch 'feature/6140-update-document-metadata' into develop commit 673e11b82b16207ef885f3bbb611391d7cbbf532 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Nov 26 16:53:30 2014 +0100 #6140 add new metadata in document views commit 1c77d64152f9b87c42155ddd19830b726bb56d38 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Nov 26 11:23:09 2014 +0100 #6140 manager document metadata in webservice commit cf38c8d9b10d0ffce7853b414efd46dcb7e9fd40 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Nov 26 10:17:13 2014 +0100 #6140 add new metadata in document entity Summary of changes: .../src/main/xmi/coselmar-model.properties | 5 +- .../src/main/xmi/coselmar-model.zargo | Bin 6029 -> 6490 bytes .../fr/ifremer/coselmar/beans/DocumentBean.java | 127 +++++++++++++++- .../coselmar/converter/BeanEntityConverter.java | 40 +++-- .../coselmar/services/v1/DocumentsWebService.java | 162 +++++++++++++++++---- .../coselmar/services/v1/UsersWebService.java | 7 +- .../src/main/webapp/js/coselmar-controllers.js | 23 ++- .../src/main/webapp/js/coselmar-services.js | 11 +- .../src/main/webapp/views/documents/document.html | 34 ++++- .../src/main/webapp/views/documents/documents.html | 6 +- .../main/webapp/views/documents/newdocument.html | 105 +++++++++++-- 11 files changed, 447 insertions(+), 73 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.