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 9839ff7afd7394587f5fa89fa7153612e7162beb Merge: 010bc96 7e7e5b0 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Dec 15 18:16:16 2014 +0100 Merge branch 'feature/6166-add-suggestion-for-keywords' into develop .../persistence/entity/DocumentTopiaDao.java | 23 ++ .../coselmar/services/v1/DocumentsWebService.java | 14 ++ coselmar-rest/src/main/resources/mapping | 8 +- .../src/main/webapp/js/coselmar-controllers.js | 59 ++++- .../main/webapp/js/coselmar-questions-services.js | 19 +- .../src/main/webapp/js/coselmar-services.js | 21 +- .../webapp/views/documents/modalDocumentEdit.html | 77 ++++--- .../main/webapp/views/documents/newdocument.html | 249 ++++++++++++--------- .../main/webapp/views/questions/editquestion.html | 10 +- 9 files changed, 331 insertions(+), 149 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.