This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from bf95eed show only active user by default new 51a0ca3 fix js new 3363548 add way to add parents with questions creation new f663f64 cannot set a question as parent of itself new 2ac5fb9 add a Question search service new 7c0480d add privacy and status as indexed property for question, and use QuestionSearchBean for lucene question search new fbea684 integrate index search for question new 84a0543 add search by keywords for questions new 66e7792 fix dependencies new 6385289 add question parents and children in ui new 6a6e527 fixes #6285 : Merge branch 'feature/6285-manage-relation-between-questions' into develop The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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 commit 63852895497e96511ebb1eb13b01e7c967fe0a03 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 8 18:31:43 2015 +0100 add question parents and children in ui commit 66e7792a49e881b7ba34af2b216a096895512379 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 8 17:34:35 2015 +0100 fix dependencies commit 84a054359d6e29d3b48b116b56393e17f0772629 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 8 17:10:50 2015 +0100 add search by keywords for questions commit fbea68405a181f596388b98595791a540c166d62 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 8 14:50:19 2015 +0100 integrate index search for question commit 7c0480d6a3a56791c1888aec0a67049bd6f2b50a Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 8 11:36:47 2015 +0100 add privacy and status as indexed property for question, and use QuestionSearchBean for lucene question search commit 2ac5fb9653ee6e40a552724e6f9e768bb080e37f Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 6 17:22:05 2015 +0100 add a Question search service commit f663f640569e86d88df89ceb2e9148cd304edc25 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 5 16:42:50 2015 +0100 cannot set a question as parent of itself commit 3363548872e4b6e443b09abcdc0ed9e762c7fbbc Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 5 16:03:04 2015 +0100 add way to add parents with questions creation commit 51a0ca377f196dd6740b714a7c24e192716b1bf8 Author: Yannick Martel <martel@©odelutin.com> Date: Mon Jan 5 14:07:37 2015 +0100 fix js Summary of changes: 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 +- coselmar-ui/src/main/webapp/js/coselmar.js | 3 - .../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 +- 21 files changed, 1087 insertions(+), 100 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java create mode 100644 coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java create mode 100644 coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.