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 d735f55 Merge branch 'release/0.7.1' adds 7fba1f3 fixes #6583 : display date in french when it is the selected language adds 83d313d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3259b30 Merge branch 'master' into develop adds 503573d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 92eb160 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 609ebba fixes #6576 tape enter validate search in referential adds 31ffb9b fixes #6577 Display "no result" instead of nothing in search results adds ed571a6 prepare service : user is authorized to see a restricted document he is in list adds db2e7e2 add restricted document in documents list (update database request) adds 621be68 fix case of remove related and closing 'restricted' documents and impact on document access adds 658e66c just be sure participant group name is same as question title adds 3ced62e manage authorized user on restricted document creation adds 7e1d69d manage authorized users in document get, and begin update mangement adds 4d74950 can modify privacy and authorized user in document edit adds 8071f46 add API to get experts list, available for expert users adds 43e514c Refs #6577 : Syntaxical modification adds 0667fa1 Merge branch 'develop' into feature/6515-restrected-access-on-document adds 2ae6ffa Fixes #6515 Merge branch 'feature/6515-restrected-access-on-document' into develop adds f8c6153 fixes #6600 fix question parents update adds 232209c on creation, question status is IN_PROGRESS adds 416a73f fixes #6517 resolve encoding problem in current user name adds 3197429 fixes #6615 order documents by deposit date desc in questions adds 0c5e21f fixes #6618 add new types for document adds 51b86af prepare release adds 6340aa6 [jgitflow-maven-plugin]updating poms for branch'release/0.8' with non-snapshot versions adds b589625 Merge branch 'release/0.8' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../persistence/entity/DocumentTopiaDao.java | 13 +- coselmar-rest/pom.xml | 3 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 23 ++- .../services/CoselmarWebServiceSupport.java | 77 ++++++++- .../coselmar/services/v1/DocumentsWebService.java | 192 ++++++++++++++++----- .../coselmar/services/v1/QuestionsWebService.java | 97 ++++++++--- .../coselmar/services/v1/UsersWebService.java | 48 +++++- coselmar-rest/src/main/resources/mapping | 1 + coselmar-ui/pom.xml | 8 +- .../src/main/webapp/i18n/angular-locale_en.js | 138 +++++++++++++++ .../src/main/webapp/i18n/angular-locale_fr.js | 120 +++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 6 + coselmar-ui/src/main/webapp/i18n/fr.js | 6 + coselmar-ui/src/main/webapp/index.html | 1 + coselmar-ui/src/main/webapp/js/angular-jwt.js | 38 ++-- .../src/main/webapp/js/coselmar-controllers.js | 113 ++++++++++-- .../main/webapp/js/coselmar-questions-services.js | 2 - .../src/main/webapp/js/coselmar-services.js | 7 + coselmar-ui/src/main/webapp/js/coselmar.js | 8 +- .../src/main/webapp/views/documents/documents.html | 1 + .../main/webapp/views/documents/editDocument.html | 38 +++- .../webapp/views/documents/modalDocumentEdit.html | 2 + .../views/documents/modalDocumentSearch.html | 1 + .../main/webapp/views/documents/newdocument.html | 30 +++- .../main/webapp/views/documents/viewDocument.html | 2 + .../main/webapp/views/questions/closeQuestion.html | 2 +- .../main/webapp/views/questions/editquestion.html | 2 +- .../views/questions/modalQuestionSearch.html | 1 + .../webapp/views/questions/newDocumentsPart.html | 2 +- .../src/main/webapp/views/questions/questions.html | 1 + .../main/webapp/views/questions/viewquestion.html | 4 +- .../main/webapp/views/referential/referential.html | 13 +- coselmar-ui/src/main/webapp/views/users/users.html | 1 + pom.xml | 17 +- 36 files changed, 888 insertions(+), 134 deletions(-) create mode 100644 coselmar-ui/src/main/webapp/i18n/angular-locale_en.js create mode 100644 coselmar-ui/src/main/webapp/i18n/angular-locale_fr.js -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.