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 ac4bb52c5822cefd5cbb90605e688e9f10d2846c Merge: 2873482 e9101fc Author: Yannick Martel <martel@©odelutin.com> Date: Mon Nov 10 11:55:22 2014 +0100 Merge branch 'feature/6010-search-document' into develop .../persistence/entity/DocumentTopiaDao.java | 17 +++++++++ .../coselmar/services/v1/DocumentsWebService.java | 11 +++++- .../src/main/webapp/js/coselmar-controllers.js | 43 ++++++++++++++++++++-- .../src/main/webapp/js/coselmar-services.js | 17 +++++++-- coselmar-ui/src/main/webapp/views/document.html | 1 + coselmar-ui/src/main/webapp/views/documents.html | 18 ++++++++- 6 files changed, 96 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.