This is an automated email from the git hooks/post-receive script. New change to branch master in repository coselmar. See http://git.codelutin.com/coselmar.git from 6ff792b fix .gitignore adds 1eca364 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6620d6f Merge branch 'master' into develop adds 2698100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 20128c4 add some validation indicator in user and document form adds 533dc4f just some code format on doucment form adds 0f5aa27 add question in entities model adds 7998ad3 prepare web service to add question adds 30703a4 prepare page form for questions adds 2c4c138 Fix initialisation : account lambda expert has no password adds 74d3dc1 manage users (experts, clients and supervisors) in Question creation UI with auto-search adds 27fa957 can add existing documents in questions adds f7060c2 add modal for document creation during question edit adds d21577d from question edit, can create a document to attach it on question : request on service returns the document adds 5f2069c #6016 can create new question adds 58ade4f Merge branch 'feature/6016-add-question' into develop adds d2753fa Css changes for display update adds 15ec2ea tidy poms adds aac2c1f Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 89abcfe fixes #6016 add entry in application to add question adds 05f4622 list questions, can delete them adds 418722a fix usage of date in js : convert it to timestamps before server call adds 64b9409 add tooltip in questions list adds c88a0b0 add question view page adds a515fab fixes #6019 participants on the question can add new documents in it adds a5b20ba prepare full edit of question adds 349b65c prepare full edit of question adds dfe0dab fix question edit mode adds e3b0a23 add filter on users during question edition adds 88130f2 manage some restriction on question content adds aa7617e add information when question is not available adds 66df66b filter questions list with privacy for an expert user adds aba84cc Merge branch 'feature/6017-edit-question' into develop adds 1c8848a question delete is not a delete, juste make question unavailable adds 43249fb can add conclusion and file with question close adds caeb07f Merge branch 'feature/6020-close-question' into develop adds aeb9248 add forgotten file for close question adds 7f398df Remove generated version file, and ignore it adds 441c2de prepare referential search adds 69e1d32 add service to get all existing themes and types for question adds cd3b50c use cdn for webjars, time to understand why it does no work with bundle adds 9e177dc use cdn for webjars, time to understand why it does no work with bundle adds 59f7748 configure webmotion to not filter on webjars path adds 028001a prepare release 0.3 adds 93d8304 [jgitflow-maven-plugin]updating poms for branch'release/0.3' with non-snapshot versions adds 65c582b Merge branch 'release/0.3' No new revisions were added by this update. Summary of changes: .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 +++ .../questions/viewRestrictedQuestion.html} | 18 +- .../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, 3950 insertions(+), 346 deletions(-) create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/SearchRequestBean.java create mode 100644 coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionBean.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserSearchBean.java create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-questions-services.js delete mode 100644 coselmar-ui/src/main/webapp/version.txt create mode 100644 coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html copy coselmar-ui/src/main/webapp/views/documents/{documents.html => modalDocumentSearch.html} (71%) create mode 100644 coselmar-ui/src/main/webapp/views/questions/closeQuestion.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/editquestion.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/newDocumentsPart.html copy coselmar-ui/src/main/webapp/views/{users/newuser.html => questions/newquestion.html} (55%) create mode 100644 coselmar-ui/src/main/webapp/views/questions/question.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/questions.html copy coselmar-ui/src/main/webapp/{WEB-INF/web.xml => views/questions/viewRestrictedQuestion.html} (65%) create mode 100644 coselmar-ui/src/main/webapp/views/questions/viewquestion.html create mode 100644 coselmar-ui/src/main/webapp/views/referential/referential.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.