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 15ec2ea tidy poms 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 new 74d3dc1 manage users (experts, clients and supervisors) in Question creation UI with auto-search new 27fa957 can add existing documents in questions new f7060c2 add modal for document creation during question edit new d21577d from question edit, can create a document to attach it on question : request on service returns the document new 5f2069c #6016 can create new question new 58ade4f Merge branch 'feature/6016-add-question' into develop new aac2c1f Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 7 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 aac2c1ffb77d83dc70d5d40f77e6a29eb42d7220 Merge: 58ade4f 15ec2ea Author: Yannick Martel <martel@©odelutin.com> Date: Fri Dec 5 11:14:09 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop Conflicts: coselmar-ui/src/main/webapp/css/coselmar.css coselmar-ui/src/main/webapp/index.html 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 commit 5f2069c3bfb78d3134e831a6d52072c614b005e0 Author: Yannick Martel <martel@©odelutin.com> Date: Fri Dec 5 11:03:49 2014 +0100 #6016 can create new question commit d21577dcbd5610154880ab9dc637d254d62350ba Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 4 18:24:21 2014 +0100 from question edit, can create a document to attach it on question : request on service returns the document commit f7060c24edbf0cb3870a0d02f299dd7718d6f248 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 4 17:41:19 2014 +0100 add modal for document creation during question edit commit 27fa957f3263c14ac4eb532c53e9a4b313807a67 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 4 16:16:01 2014 +0100 can add existing documents in questions commit 74d3dc1a7bdb5860163e2b6b9070a8d5154a6a7f Author: Yannick Martel <martel@©odelutin.com> Date: Wed Dec 3 17:49:23 2014 +0100 manage users (experts, clients and supervisors) in Question creation UI with auto-search Summary of changes: .../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 | 6 + .../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, 1354 insertions(+), 23 deletions(-) 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/services/v1/QuestionsWebService.java create mode 100644 coselmar-ui/src/main/webapp/js/coselmar-questions-services.js create mode 100644 coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html create mode 100644 coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/editquestion.html create mode 100644 coselmar-ui/src/main/webapp/views/questions/newquestion.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.