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 65c582bb43b9502cc83898212435f7de83a5dcda Merge: 6ff792b 93d8304 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:18:50 2014 +0000 Merge branch 'release/0.3' .gitignore | 1 + coselmar-bundle/pom.xml | 22 +- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 6 + coselmar-persistence/pom.xml | 8 +- .../coselmar/persistence/SearchRequestBean.java | 79 +++ .../persistence/entity/CoselmarUserTopiaDao.java | 119 ++++ .../persistence/entity/DocumentTopiaDao.java | 4 +- .../persistence/entity/QuestionTopiaDao.java | 82 +++ .../src/main/xmi/coselmar-model.properties | 4 +- .../src/main/xmi/coselmar-model.zargo | Bin 6557 -> 10090 bytes coselmar-rest/pom.xml | 10 +- .../fr/ifremer/coselmar/beans/QuestionBean.java | 299 ++++++++ .../fr/ifremer/coselmar/beans/UserSearchBean.java | 76 ++ .../coselmar/converter/BeanEntityConverter.java | 172 +++++ .../services/CoselmarRestApplicationListener.java | 6 +- .../services/CoselmarWebServiceSupport.java | 22 + .../coselmar/services/v1/DocumentsWebService.java | 19 +- .../services/v1/InitialisationService.java | 16 +- .../coselmar/services/v1/QuestionsWebService.java | 771 +++++++++++++++++++++ .../coselmar/services/v1/UsersWebService.java | 16 +- coselmar-rest/src/main/resources/mapping | 17 +- coselmar-ui/pom.xml | 33 +- coselmar-ui/src/main/webapp/css/coselmar.css | 131 +++- coselmar-ui/src/main/webapp/index.html | 50 +- .../src/main/webapp/js/coselmar-controllers.js | 583 +++++++++++++++- .../main/webapp/js/coselmar-questions-services.js | 97 +++ .../src/main/webapp/js/coselmar-services.js | 1 - coselmar-ui/src/main/webapp/js/coselmar.js | 19 + coselmar-ui/src/main/webapp/version.txt | 1 - .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../webapp/views/documents/modalDocumentEdit.html | 221 ++++++ .../{documents.html => modalDocumentSearch.html} | 24 +- .../main/webapp/views/documents/newdocument.html | 319 +++++---- coselmar-ui/src/main/webapp/views/home.html | 19 +- .../main/webapp/views/questions/closeQuestion.html | 79 +++ .../main/webapp/views/questions/editquestion.html | 274 ++++++++ .../webapp/views/questions/newDocumentsPart.html | 61 ++ .../newuser.html => questions/newquestion.html} | 26 +- .../src/main/webapp/views/questions/question.html | 88 +++ .../src/main/webapp/views/questions/questions.html | 84 +++ .../viewRestrictedQuestion.html} | 23 +- .../main/webapp/views/questions/viewquestion.html | 211 ++++++ .../main/webapp/views/referential/referential.html | 82 +++ .../src/main/webapp/views/users/edituser.html | 37 +- .../src/main/webapp/views/users/newuser.html | 2 +- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 10 +- pom.xml | 69 +- 49 files changed, 3948 insertions(+), 353 deletions(-) diff --cc .gitignore index 5d54f66,0ae7e26..fc6f9da --- a/.gitignore +++ b/.gitignore @@@ -17,6 -17,5 +17,7 @@@ /.settings /*/.settings /*/*.zargo~ +coselmar-ui/src/main/webapp/version.txt + + coselmar-ui/src/main/webapp/version.txt -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.