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 fe67fd5928d84c58270230c96960515c968d6f68 Merge: d63a60c daf9709 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 4 16:07:18 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.4' into 'master' coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 2 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/beans/QuestionSearchExample.java | 11 + .../fr/ifremer/coselmar/persistence/DaoUtils.java | 17 + .../persistence/entity/CoselmarUserTopiaDao.java | 5 +- .../persistence/entity/DocumentTopiaDao.java | 88 +++-- .../persistence/entity/QuestionTopiaDao.java | 118 ++++-- .../V1_4_0_1__7911_add_citation_in_documents.sql | 23 ++ .../src/main/xmi/coselmar-model.properties | 1 + .../src/main/xmi/coselmar-model.zargo | Bin 10955 -> 11007 bytes coselmar-rest/pom.xml | 2 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 13 +- .../ifremer/coselmar/beans/DocumentSearchBean.java | 4 +- .../ifremer/coselmar/beans/QuestionSearchBean.java | 38 ++ .../ifremer/coselmar/beans/QuestionUserRole.java | 20 +- .../coselmar/converter/BeanEntityConverter.java | 6 +- .../services/StringLongMapValueComparator.java | 36 +- .../indexation/DocumentsIndexationService.java | 42 ++- .../indexation/QuestionsIndexationService.java | 39 +- .../indexation/TransverseIndexationService.java | 44 ++- .../coselmar/services/v1/DocumentsWebService.java | 45 ++- .../coselmar/services/v1/QuestionsWebService.java | 176 ++++++++- .../coselmar/services/v1/UsersWebService.java | 32 +- coselmar-rest/src/main/resources/mapping | 4 + .../coselmar/services/QuestionsWebServiceTest.java | 161 ++++++++ .../indexation/DocumentsIndexationServiceTest.java | 16 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 165 +++++++- coselmar-ui/src/main/webapp/i18n/en.js | 16 + coselmar-ui/src/main/webapp/i18n/fr.js | 16 + coselmar-ui/src/main/webapp/index.html | 5 + .../src/main/webapp/js/coselmar-admin-services.js | 2 +- .../src/main/webapp/js/coselmar-constants.js | 5 +- .../src/main/webapp/js/coselmar-controllers.js | 207 ++++++++-- .../main/webapp/js/coselmar-general-services.js | 2 +- coselmar-ui/src/main/webapp/js/coselmar-health.js | 2 +- .../main/webapp/js/coselmar-questions-services.js | 27 +- .../src/main/webapp/js/coselmar-services.js | 11 +- .../src/main/webapp/js/coselmar-user-services.js | 19 +- .../src/main/webapp/js/d3-2waytree-graph.js | 415 ++++++++++++--------- coselmar-ui/src/main/webapp/js/paginationBinder.js | 89 +++++ .../src/main/webapp/views/documents/documents.html | 3 +- .../main/webapp/views/documents/editDocument.html | 70 ++-- .../webapp/views/documents/modalDocumentEdit.html | 53 +-- .../views/documents/modalDocumentSearch.html | 8 +- .../main/webapp/views/documents/newdocument.html | 53 +-- .../src/main/webapp/views/documents/toolsPart.html | 8 +- .../main/webapp/views/documents/viewDocument.html | 9 +- .../src/main/webapp/views/paginationTemplate.html | 39 ++ .../main/webapp/views/questions/closeQuestion.html | 2 +- .../main/webapp/views/questions/editquestion.html | 131 ++++--- .../views/questions/modalQuestionSearch.html | 9 +- .../src/main/webapp/views/questions/questions.html | 7 +- .../src/main/webapp/views/questions/toolsPart.html | 9 +- .../src/main/webapp/views/users/adminUsers.html | 31 +- .../src/main/webapp/views/users/searchPart.html | 8 +- .../main/webapp/views/users/supervisorUsers.html | 35 +- coselmar-ui/src/main/webapp/views/users/user.html | 75 +++- coselmar-ui/src/main/webapp/views/users/users.html | 4 +- pom.xml | 4 +- 61 files changed, 1904 insertions(+), 584 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.