This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 762cf525260f67af9bcd72e13d21172e577df85d Merge: fe67fd5 7eaea0a Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 29 16:32:33 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../java/fr/ifremer/coselmar/beans/CloudWord.java | 0 .../coselmar/config/CoselmarServicesConfig.java | 7 + .../fr/ifremer/coselmar/persistence/DaoUtils.java | 5 + .../persistence/entity/DocumentTopiaDao.java | 183 ++++++++++++++++++ .../persistence/entity/QuestionTopiaDao.java | 63 +++++++ .../migration/V1_5_0_1__7974_add_pg_dictionary.sql | 32 ++++ coselmar-rest/pom.xml | 2 +- .../indexation/DocumentsIndexationService.java | 8 +- .../coselmar/services/indexation/LuceneUtils.java | 3 +- .../indexation/QuestionsIndexationService.java | 8 +- .../coselmar/services/v1/DocumentsWebService.java | 87 ++++++++- .../coselmar/services/v1/QuestionsWebService.java | 52 +++-- coselmar-rest/src/main/resources/mapping | 2 + .../indexation/DocumentsIndexationServiceTest.java | 6 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 112 +++++++++-- coselmar-ui/src/main/webapp/i18n/en.js | 40 ++++ coselmar-ui/src/main/webapp/i18n/fr.js | 41 ++++ coselmar-ui/src/main/webapp/index.html | 38 +++- .../src/main/webapp/js/coselmar-controllers.js | 209 ++++++++++++++++++--- .../main/webapp/js/coselmar-questions-services.js | 8 + .../src/main/webapp/js/coselmar-services.js | 6 + .../src/main/webapp/views/documents/documents.html | 7 +- .../main/webapp/views/documents/editDocument.html | 99 ++++++---- .../modalBibliography.html} | 24 ++- .../webapp/views/documents/modalDocumentEdit.html | 67 ++++--- .../views/documents/modalDocumentSearch.html | 12 +- .../main/webapp/views/documents/newdocument.html | 89 ++++++--- .../src/main/webapp/views/documents/toolsPart.html | 18 +- .../main/webapp/views/documents/viewDocument.html | 2 +- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../src/main/webapp/views/links/modalLinkEdit.html | 19 +- .../src/main/webapp/views/paginationTemplate.html | 5 +- .../main/webapp/views/questions/closeQuestion.html | 17 +- .../main/webapp/views/questions/editquestion.html | 52 +++-- .../webapp/views/questions/modalHierarchy.html | 2 +- .../views/questions/modalQuestionSearch.html | 12 +- .../main/webapp/views/questions/newquestion.html | 3 + .../src/main/webapp/views/questions/question.html | 19 +- .../src/main/webapp/views/questions/toolsPart.html | 12 +- .../main/webapp/views/questions/viewquestion.html | 8 + .../main/webapp/views/referential/referential.html | 2 +- .../src/main/webapp/views/users/edituser.html | 23 ++- .../src/main/webapp/views/users/newPassword.html | 4 +- .../src/main/webapp/views/users/searchPart.html | 12 +- pom.xml | 2 +- 48 files changed, 1148 insertions(+), 282 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.