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 3c42708 Merge branch 'feature/6140-update-document-metadata' into develop new 81fb833 #6142 #6143 only Admin, supervisor, expert (public) or admin, supervisor, owner can view and delete document new 5e32997 #6142 Filter documents list according to privacy and userRole new 3679385 Merge branch 'feature/6142-filter-documents-list' 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 367938536e53cb2214d902a529a88dd53ea325ba Merge: 3c42708 5e32997 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 27 11:11:37 2014 +0100 Merge branch 'feature/6142-filter-documents-list' into develop commit 5e3299722403c4f027fde642d99e9204dceedc5e Author: Yannick Martel <martel@©odelutin.com> Date: Thu Nov 27 11:11:18 2014 +0100 #6142 Filter documents list according to privacy and userRole commit 81fb833326127ce16207d00d786e7f29e63a2934 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Nov 26 18:18:51 2014 +0100 #6142 #6143 only Admin, supervisor, expert (public) or admin, supervisor, owner can view and delete document Summary of changes: .../fr/ifremer/coselmar/persistence/DaoUtils.java | 112 ++++++++++++++ .../persistence/entity/DocumentTopiaDao.java | 32 ++++ .../services/CoselmarWebServiceSupport.java | 13 ++ .../coselmar/services/v1/DocumentsWebService.java | 162 ++++++++++++++++++--- coselmar-ui/src/main/webapp/index.html | 8 +- .../src/main/webapp/js/coselmar-controllers.js | 2 +- .../src/main/webapp/views/documents/documents.html | 2 +- .../main/webapp/views/documents/newdocument.html | 17 ++- 8 files changed, 311 insertions(+), 37 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.