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 269cdabb6505f21c11fc3dac779ecae4e2bf91f7 Merge: 6f653f6 7995812 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:49 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.2' into 'master' coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 2 +- coselmar-persistence/pom.xml | 8 +- .../coselmar/beans/DocumentSearchExample.java | 24 + .../coselmar/beans/QuestionSearchExample.java | 110 + .../fr/ifremer/coselmar/beans/SearchExample.java | 20 +- .../coselmar/config/CoselmarServicesConfig.java | 4 + .../config/CoselmarServicesConfigOption.java | 5 + .../persistence/entity/QuestionTopiaDao.java | 83 +- .../V1_2_0_1__7867_add_list_links_in_projects.sql | 34 + .../src/main/xmi/coselmar-model.zargo | Bin 10470 -> 10955 bytes .../resources/coselmar-persistence-test.properties | 3 +- coselmar-rest/pom.xml | 2 +- .../ifremer/coselmar/beans/DocumentSearchBean.java | 20 + .../java/fr/ifremer/coselmar/beans/HealthBean.java | 73 + .../java/fr/ifremer/coselmar/beans/LinkBean.java | 40 +- .../fr/ifremer/coselmar/beans/QuestionBean.java | 17 + .../coselmar/beans/QuestionExportModel.java | 21 +- ...mentSearchBean.java => QuestionSearchBean.java} | 48 +- .../ifremer/coselmar/beans/QuestionTreeNode.java | 116 ++ .../java/fr/ifremer/coselmar/beans/UserBean.java | 9 + .../fr/ifremer/coselmar/beans/UserExportModel.java | 76 + .../coselmar/converter/BeanEntityConverter.java | 84 + .../services/CoselmarRestApplicationListener.java | 6 +- .../coselmar/services/indexation/LuceneUtils.java | 9 +- .../indexation/QuestionsIndexationService.java | 1 + .../indexation/TransverseIndexationService.java | 13 - .../coselmar/services/v1/DocumentsWebService.java | 38 +- .../coselmar/services/v1/HealthService.java | 79 + .../coselmar/services/v1/QuestionsWebService.java | 363 +++- .../coselmar/services/v1/UsersWebService.java | 58 + .../i18n/coselmar-services_en_GB.properties | 24 +- .../i18n/coselmar-services_fr_FR.properties | 23 +- coselmar-rest/src/main/resources/mapping | 9 +- .../coselmar/services/QuestionsWebServiceTest.java | 2 +- .../indexation/DocumentsIndexationServiceTest.java | 22 +- .../indexation/QuestionsIndexationServiceTest.java | 2 +- .../src/test/resources/coselmar-test.properties | 3 +- coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 53 +- .../src/main/webapp/css/d3-collapsible-tree.css | 132 ++ coselmar-ui/src/main/webapp/health.html | 53 + coselmar-ui/src/main/webapp/i18n/en.js | 24 +- coselmar-ui/src/main/webapp/i18n/fr.js | 32 +- coselmar-ui/src/main/webapp/index.html | 3 + .../src/main/webapp/js/coselmar-admin-services.js | 2 +- .../src/main/webapp/js/coselmar-constants.js | 13 +- .../src/main/webapp/js/coselmar-controllers.js | 361 +++- .../main/webapp/js/coselmar-general-services.js | 2 +- .../{coselmar-constants.js => coselmar-health.js} | 18 +- .../main/webapp/js/coselmar-questions-services.js | 18 +- .../src/main/webapp/js/coselmar-services.js | 2 +- .../src/main/webapp/js/coselmar-user-services.js | 7 +- .../src/main/webapp/js/d3-2waytree-graph.js | 447 ++++ coselmar-ui/src/main/webapp/js/d3.layout.js | 2146 ++++++++++++++++++++ .../src/main/webapp/views/documents/documents.html | 2 +- .../main/webapp/views/documents/editDocument.html | 13 +- .../webapp/views/documents/modalDocumentEdit.html | 17 +- .../main/webapp/views/documents/newdocument.html | 13 +- .../src/main/webapp/views/documents/toolsPart.html | 113 +- .../main/webapp/views/documents/viewDocument.html | 4 +- coselmar-ui/src/main/webapp/views/home.html | 56 +- .../src/main/webapp/views/links/modalLinkEdit.html | 81 + .../main/webapp/views/questions/editquestion.html | 44 +- .../users.html => questions/modalHierarchy.html} | 30 +- .../src/main/webapp/views/questions/questions.html | 35 +- .../src/main/webapp/views/questions/toolsPart.html | 165 ++ .../main/webapp/views/questions/viewquestion.html | 22 +- .../main/webapp/views/referential/referential.html | 4 +- .../src/main/webapp/views/users/searchPart.html | 10 +- coselmar-ui/src/main/webapp/views/users/users.html | 8 + pom.xml | 16 +- 72 files changed, 5044 insertions(+), 363 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.