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 aba84cc Merge branch 'feature/6017-edit-question' into develop new 1c8848a question delete is not a delete, juste make question unavailable new 43249fb can add conclusion and file with question close new caeb07f Merge branch 'feature/6020-close-question' into develop The 3 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 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 commit 43249fb297d6583611a8eb471cac509869b0b71a Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 11 10:38:49 2014 +0100 can add conclusion and file with question close commit 1c8848a90fe0ebbed6ad99e1d94a0bd4bfafe7d3 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 10 19:24:26 2014 +0100 question delete is not a delete, juste make question unavailable Summary of changes: .../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>.