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 caeb07fe58e895f72c1706097ce6da04d61a27d6 Merge: aba84cc 43249fb Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 11 10:39:22 2014 +0100 Merge branch 'feature/6020-close-question' into develop .../src/main/xmi/coselmar-model.properties | 3 +- .../src/main/xmi/coselmar-model.zargo | Bin 9741 -> 10090 bytes .../fr/ifremer/coselmar/beans/QuestionBean.java | 27 +++++++++++++++ .../coselmar/converter/BeanEntityConverter.java | 22 ++++++++++++ .../coselmar/services/v1/QuestionsWebService.java | 27 +++++++++++++-- .../src/main/webapp/js/coselmar-controllers.js | 10 +++++- .../src/main/webapp/views/questions/question.html | 22 +++++++----- .../views/questions/viewRestrictedQuestion.html | 2 -- .../main/webapp/views/questions/viewquestion.html | 37 +++++++++++++++++++++ 9 files changed, 136 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.