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 6a6e52797ce0a96db09d42b9894d3f7eb7983c28 Merge: 51a0ca3 6385289 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 8 18:31:52 2015 +0100 fixes #6285 : Merge branch 'feature/6285-manage-relation-between-questions' into develop coselmar-persistence/pom.xml | 16 -- .../ifremer/coselmar/beans/QuestionSearchBean.java | 40 +++ .../fr/ifremer/coselmar/persistence/DaoUtils.java | 15 ++ .../persistence/entity/QuestionTopiaDao.java | 162 ++++++++++- coselmar-rest/pom.xml | 4 - .../coselmar/converter/BeanEntityConverter.java | 2 +- .../services/CoselmarRestApplicationListener.java | 4 +- .../indexation/QuestionsIndexationService.java | 77 ++++-- .../services/v1/InitialisationService.java | 13 + .../coselmar/services/v1/QuestionsWebService.java | 189 +++++++++++-- .../services/FakeCoselmarApplicationContext.java | 8 + .../coselmar/services/QuestionsWebServiceTest.java | 299 +++++++++++++++++++++ .../indexation/QuestionsIndexationServiceTest.java | 106 ++++++-- .../src/main/webapp/js/coselmar-controllers.js | 82 +++++- .../main/webapp/js/coselmar-questions-services.js | 14 +- .../main/webapp/views/questions/editquestion.html | 37 +++ .../views/questions/modalQuestionSearch.html | 48 ++++ .../src/main/webapp/views/questions/questions.html | 8 + .../views/questions/viewRestrictedQuestion.html | 32 ++- .../main/webapp/views/questions/viewquestion.html | 28 +- 20 files changed, 1087 insertions(+), 97 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.