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 58ade4f032622eedf21df74b4de4dc394a757ee1 Merge: 533dc4f 5f2069c Author: Yannick Martel <martel@©odelutin.com> Date: Fri Dec 5 11:04:14 2014 +0100 Merge branch 'feature/6016-add-question' into develop .../persistence/entity/CoselmarUserTopiaDao.java | 86 +++++++ .../persistence/entity/DocumentTopiaDao.java | 4 +- .../src/main/xmi/coselmar-model.zargo | Bin 6557 -> 9735 bytes .../fr/ifremer/coselmar/beans/QuestionBean.java | 188 +++++++++++++++ .../coselmar/converter/BeanEntityConverter.java | 16 ++ .../services/CoselmarRestApplicationListener.java | 4 +- .../services/CoselmarWebServiceSupport.java | 22 ++ .../coselmar/services/v1/DocumentsWebService.java | 16 +- .../services/v1/InitialisationService.java | 16 +- .../coselmar/services/v1/QuestionsWebService.java | 216 +++++++++++++++++ .../coselmar/services/v1/UsersWebService.java | 8 +- coselmar-rest/src/main/resources/mapping | 11 +- coselmar-ui/pom.xml | 6 + coselmar-ui/src/main/webapp/css/coselmar.css | 5 + coselmar-ui/src/main/webapp/index.html | 8 +- .../src/main/webapp/js/coselmar-controllers.js | 200 +++++++++++++++- .../main/webapp/js/coselmar-questions-services.js | 41 ++++ .../src/main/webapp/js/coselmar-services.js | 1 - coselmar-ui/src/main/webapp/js/coselmar.js | 10 + .../webapp/views/documents/modalDocumentEdit.html | 198 ++++++++++++++++ .../views/documents/modalDocumentSearch.html | 45 ++++ .../main/webapp/views/questions/editquestion.html | 257 +++++++++++++++++++++ .../main/webapp/views/questions/newquestion.html | 11 + pom.xml | 10 +- 24 files changed, 1355 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.