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 12c71d0 Merge branch 'release/0.5' adds 8dc289e [jgitflow-maven-plugin]updating poms for 0.6-SNAPSHOT development adds c19f8f9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2417d30 Merge branch 'master' into develop adds a73f267 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fc0ae77 fixes #6434 add some placeholders adds 97d27e1 start review of user search adds 3055de4 prepare advanced search on users adds 2f41890 can switch simple/advanced search on user adds 6f93a2b fixes #6205 Merge branch 'feature/6205-improve-user-search' into develop adds 993c889 fix error on user search with active, inactive, both adds 4c5b6ed change 'Deleted' label to 'disable' for users, and redirect to users list after modify adds e24edc0 review data encoding with POST method adds ea8bffd change way to create document with file, in order to have metadata in utf-8 : split into to ways : first create document and then attach file adds 924395d Fixes #6438 Merge branch 'feature/6438-improve-user-management' into develop adds 9164c42 fix compil... adds 3a8ba65 try webmotion 2.5-SNAPSHOT adds 092d492 fixes #6429 review initial load off referential page adds b4ffcf9 review way to update data in lucene index adds 844afae supervisor can create client user adds f13b8d3 allow supervisor to add client user from ui adds 5e0d885 fixes #6504 change application title adds 289e7d4 merge changes from develop adds 78b17b9 supervisor is able to edit client profile adds c489e6a fixes #6308 : Merge branch 'feature/6308-supervisor-can-create-client' into develop adds d97bdc2 fix user edit permission in service to be get own profile as supervisor adds 568dce2 add second new password input to avoid bad write in password adds 7c43e75 fixes #6440 Merge branch 'feature/6440-add-second-input-for-password-change' into develop adds 4e09a96 prepare document edit service adds 19ba20f fix unit test for login adds b54a05d Merge branch 'develop' into feature/6435-modify-document adds 9139630 add edit document page adds b0a9c28 cannot edit document used by questions adds b789cd4 fixes #6435 Merge branch 'feature/6435-modify-document' into develop adds 3290654 Refs #6308 : Change information text for supervisor admin page adds c615964 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds d201394 Refs #6440 : Update display of user edition page adds cf4f833 better filter for document edit and delete adds 949faa6 i18n menu and document part adds c7383c1 i18n question part adds 0429979 i18n question part adds 987afe4 i18n users part adds 6220fb4 i18n french translation adds bec58be fixes #6202 Merge branch 'feature/6202-add-multiliguage' into develop adds 088e487 add an unit test to highlight error with topia during deletion adds 5987947 Use topia SNAPSHOT to fix issue adds 1e73bf2 move config to persistence package, add an unit test about cascade deletion bug with document and questions, use snapshot topia solution adds f7f716d fix default locale adds 4bef73f fix relatedQuestion info from documents Fix view of document in question adds ab97af5 use stable version for topia and webmotion adds efcdb80 fix pom dependencies adds 20f1407 fix bundle module javascript constants... adds b42365b Prepare release adds 03ab385 [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions adds 22b6b6a Merge branch 'release/0.6' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 3 +- coselmar-persistence/pom.xml | 40 ++- .../coselmar}/config/CoselmarServicesConfig.java | 4 +- .../config/CoselmarServicesConfigOption.java | 2 +- .../exceptions}/CoselmarTechnicalException.java | 2 +- .../persistence/entity/CoselmarUserTopiaDao.java | 8 +- .../i18n/coselmar-persistence_en_GB.properties | 2 + .../i18n/coselmar-persistence_fr_FR.properties | 2 + .../src/main/xmi/coselmar-model.zargo | Bin 10322 -> 10390 bytes .../java/fr/ifremer/AbstractCoselmarDaoTest.java | 11 +- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 99 ++++++++ .../ifremer}/FakeCoselmarApplicationContext.java | 141 ++--------- .../resources/coselmar-persistence-test.properties | 0 coselmar-rest/pom.xml | 6 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 49 +++- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 10 +- .../coselmar/converter/BeanEntityConverter.java | 17 +- .../services/CoselmarApplicationContext.java | 2 +- .../CoselmarServicesApplicationContext.java | 2 +- .../coselmar/services/CoselmarServicesContext.java | 2 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 3 +- .../services/DefaultCoselmarServicesContext.java | 3 +- .../indexation/DocumentsIndexationService.java | 9 +- .../coselmar/services/indexation/LuceneUtils.java | 2 +- .../indexation/QuestionsIndexationService.java | 11 +- .../coselmar/services/v1/AdminWebService.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 166 ++++++++++-- .../coselmar/services/v1/QuestionsWebService.java | 2 +- .../coselmar/services/v1/UsersWebService.java | 80 ++++-- .../main/resources/coselmar-services.properties | 2 + coselmar-rest/src/main/resources/mapping | 7 +- .../services/FakeCoselmarApplicationContext.java | 4 +- .../services/FakeCoselmarServicesContext.java | 2 +- .../coselmar/services/UsersWebServiceTest.java | 54 +++- .../indexation/DocumentsIndexationServiceTest.java | 32 +-- .../indexation/QuestionsIndexationServiceTest.java | 12 + coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 6 + coselmar-ui/src/main/webapp/i18n/en.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/img/en.png | Bin 0 -> 599 bytes coselmar-ui/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes coselmar-ui/src/main/webapp/index.html | 64 +++-- .../src/main/webapp/js/coselmar-constants.js | 5 +- .../src/main/webapp/js/coselmar-controllers.js | 280 ++++++++++++++++----- .../main/webapp/js/coselmar-questions-services.js | 14 +- .../src/main/webapp/js/coselmar-services.js | 52 +++- .../src/main/webapp/js/coselmar-user-services.js | 39 +-- coselmar-ui/src/main/webapp/js/coselmar.js | 16 +- .../src/main/webapp/views/admin/admintools.html | 12 +- .../src/main/webapp/views/documents/document.html | 78 +----- .../src/main/webapp/views/documents/documents.html | 28 +-- .../{newdocument.html => editDocument.html} | 106 ++++---- .../webapp/views/documents/modalDocumentEdit.html | 66 ++--- .../views/documents/modalDocumentSearch.html | 16 +- .../main/webapp/views/documents/newdocument.html | 73 +++--- .../documents/{document.html => viewDocument.html} | 58 +++-- .../main/webapp/views/questions/closeQuestion.html | 14 +- .../main/webapp/views/questions/editquestion.html | 60 ++--- .../views/questions/modalQuestionSearch.html | 14 +- .../webapp/views/questions/newDocumentsPart.html | 12 +- .../main/webapp/views/questions/newquestion.html | 4 +- .../src/main/webapp/views/questions/question.html | 16 +- .../src/main/webapp/views/questions/questions.html | 26 +- .../views/questions/viewRestrictedQuestion.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 52 ++-- .../main/webapp/views/referential/referential.html | 35 +-- .../src/main/webapp/views/users/adminUsers.html | 122 +++++++++ .../src/main/webapp/views/users/edituser.html | 98 ++++++-- .../src/main/webapp/views/users/newuser.html | 15 +- .../main/webapp/views/users/supervisorUsers.html | 123 +++++++++ coselmar-ui/src/main/webapp/views/users/user.html | 26 +- coselmar-ui/src/main/webapp/views/users/users.html | 61 +---- pom.xml | 28 ++- 76 files changed, 2033 insertions(+), 865 deletions(-) rename {coselmar-rest/src/main/java/fr/ifremer/coselmar/services => coselmar-persistence/src/main/java/fr/ifremer/coselmar}/config/CoselmarServicesConfig.java (98%) rename {coselmar-rest/src/main/java/fr/ifremer/coselmar/services => coselmar-persistence/src/main/java/fr/ifremer/coselmar}/config/CoselmarServicesConfigOption.java (98%) rename {coselmar-rest/src/main/java/fr/ifremer/coselmar/services => coselmar-persistence/src/main/java/fr/ifremer/coselmar/exceptions}/CoselmarTechnicalException.java (97%) copy coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarServiceTest.java => coselmar-persistence/src/test/java/fr/ifremer/AbstractCoselmarDaoTest.java (74%) create mode 100644 coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java copy {coselmar-rest/src/test/java/fr/ifremer/coselmar/services => coselmar-persistence/src/test/java/fr/ifremer}/FakeCoselmarApplicationContext.java (56%) copy coselmar-rest/src/main/resources/coselmar-services.properties => coselmar-persistence/src/test/resources/coselmar-persistence-test.properties (100%) create mode 100644 coselmar-ui/src/main/webapp/i18n/en.js create mode 100644 coselmar-ui/src/main/webapp/i18n/fr.js create mode 100644 coselmar-ui/src/main/webapp/img/en.png create mode 100644 coselmar-ui/src/main/webapp/img/fr.png copy coselmar-ui/src/main/webapp/views/documents/{newdocument.html => editDocument.html} (65%) copy coselmar-ui/src/main/webapp/views/documents/{document.html => viewDocument.html} (50%) create mode 100644 coselmar-ui/src/main/webapp/views/users/adminUsers.html create mode 100644 coselmar-ui/src/main/webapp/views/users/supervisorUsers.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.