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 aba84cc0d06c13274dd9a4bc0b40dd4abdc5aea8 Merge: 64b9409 66df66b Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 19:12:48 2014 +0100 Merge branch 'feature/6017-edit-question' into develop .../coselmar/persistence/SearchRequestBean.java | 55 +++ .../persistence/entity/CoselmarUserTopiaDao.java | 37 +- .../persistence/entity/QuestionTopiaDao.java | 35 ++ .../src/main/xmi/coselmar-model.properties | 3 +- .../src/main/xmi/coselmar-model.zargo | Bin 9735 -> 9741 bytes .../fr/ifremer/coselmar/beans/QuestionBean.java | 10 + .../fr/ifremer/coselmar/beans/UserSearchBean.java | 76 ++++ .../coselmar/converter/BeanEntityConverter.java | 44 ++- .../services/CoselmarRestApplicationListener.java | 4 +- .../coselmar/services/v1/QuestionsWebService.java | 393 ++++++++++++++++++++- .../coselmar/services/v1/UsersWebService.java | 16 +- coselmar-rest/src/main/resources/mapping | 6 +- .../src/main/webapp/js/coselmar-controllers.js | 348 ++++++++++++++---- .../main/webapp/js/coselmar-questions-services.js | 30 +- coselmar-ui/src/main/webapp/js/coselmar.js | 6 +- .../main/webapp/views/questions/editquestion.html | 28 +- .../webapp/views/questions/newDocumentsPart.html | 38 ++ .../main/webapp/views/questions/newquestion.html | 14 +- .../src/main/webapp/views/questions/question.html | 59 ++++ .../views/questions/viewRestrictedQuestion.html | 15 + .../main/webapp/views/questions/viewquestion.html | 151 ++++++++ 21 files changed, 1247 insertions(+), 121 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.