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 22b6b6a Merge branch 'release/0.6' adds bacd44c [jgitflow-maven-plugin]updating poms for 0.7-SNAPSHOT development adds e01e771 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0a52409 Merge branch 'master' into develop adds 93c275a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds efe50d4 create some predefined document types adds d844843 manage new predefined document type adds a34520d fixes #6431 Merge branch 'feature/6431-document-type-as-defined-list' into develop adds a6fe9d1 fixes #6502 : Change menu order adds 18e9db9 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 4931f5d fixes #6436 use predefined values for question type adds 7462a3d fixes #6552 add a 'new document' button for supervisor adds ba33c15 fixes #6545 fix i18n key in user form adds 20137fa fix default example values for advance search on user adds cfe61da review advanced search part on users adds d69ec96 fix user advanced search display as admin adds 7896917 Fixes #6553 Merge branch 'feature/6553-fix-advanced-search-users' into develop adds dae9143 Fixes #6501: Add user profil in header & Fixes #6546: Add coselmar logo adds 5978299 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 5bc95a1 Fixes #6503: Move edit button on question view page adds a4555ef Syntaxical corrections adds 3862881 Refs-30 #6547 : Change display of question page adds dcd3eff Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 908e179 add rest services to generate new password and send it by mail adds cbfefbf add ui for forgotten password adds c5b48f8 Merge branch 'feature/6439-reinit-password' into develop adds 37bdcc1 Refs-60 #6547: Change display of question, document, referential and users pages adds 2107c8d Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 31d7b3e Fixes #6547 : Change display of question, document, referential and users pages adds f675fc0 Refs-70 #6536 : Better show question status adds 7b34e06 add related questions in document view adds 5d37eb0 remove fixme adds 54a84fd fixes #6207 Merge branch 'feature/6207-list-questions-containing-document' into develop adds 2e8c9c7 Add dismissed ccs changes adds 550f80e Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds 0cf001c fixes #6433 fix form validation when adding new keyword/theme adds f2fe43b Little css modification adds 8bb79ba add translation of question status in parent list adds 8030790 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop adds ed39489 can remove file from document during save adds 374ec38 be able in ui to remove document file adds 2cf3d10 Merge branch 'feature/6549-modify-or-delete-document-file' into develop adds 4a66b73 fixes #6587 replace 'questions' by 'projects' adds 94827f6 fixes #6586 change main page text adds 9052472 fixes #6584 fix question delete message in question view adds 28e53d2 fixes #6579 fix mails subject and body adds 86bd254 fix english translation for welcome page adds 0611219 Fixes #6581 : Fix display issue when closing a question adds 97365df Refs #6549 : Little change on display adds 521b88a admin should be able to modify document (and its file) adds 2e55b39 fix placeholders in questions : used project instead of question adds e74040c Fixes close button issue in alerts adds e0ddaee fixes #6593 review management of question.themes in UI and in services adds e2a425b fix validate button in question create/edit adds 5b3ce0e Fixes #6580 : Change advanced search button display adds ff5bb8b Little display change on users list page adds ec8a680 prepare release adds bce2bb7 [jgitflow-maven-plugin]updating poms for branch'release/0.7' with non-snapshot versions adds c6dc0f8 Merge branch 'release/0.7' No new revisions were added by this update. Summary of changes: coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/config/CoselmarServicesConfig.java | 4 + .../config/CoselmarServicesConfigOption.java | 5 + .../persistence/entity/CoselmarUserTopiaDao.java | 11 +- coselmar-rest/pom.xml | 2 +- ...erAccountCreatedMail.java => AbstractMail.java} | 33 +-- ...countCreatedMail.java => LostPasswordMail.java} | 46 +--- .../coselmar/beans/UserAccountCreatedMail.java | 40 +--- ...eatedMail.java => UserPasswordChangedMail.java} | 46 +--- .../indexation/DocumentsIndexationService.java | 12 +- .../indexation/QuestionsIndexationService.java | 12 +- .../coselmar/services/v1/DocumentsWebService.java | 40 +++- .../coselmar/services/v1/QuestionsWebService.java | 14 ++ .../coselmar/services/v1/UsersWebService.java | 54 ++++- .../i18n/coselmar-services_en_GB.properties | 4 +- .../i18n/coselmar-services_fr_FR.properties | 4 +- .../main/resources/mail/LostPasswordMail.mustache | 13 + .../resources/mail/LostPasswordMail_fr.mustache | 13 + .../resources/mail/UserAccountCreatedMail.mustache | 4 +- .../mail/UserAccountCreatedMail_fr.mustache | 4 +- .../mail/UserPasswordChangedMail.mustache | 13 + .../mail/UserPasswordChangedMail_fr.mustache | 13 + coselmar-rest/src/main/resources/mapping | 1 + .../coselmar/services/UsersWebServiceTest.java | 23 ++ coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 266 ++++++++++++++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 93 +++++-- coselmar-ui/src/main/webapp/i18n/fr.js | 101 ++++++-- coselmar-ui/src/main/webapp/img/StatusIcons.png | Bin 0 -> 2005 bytes coselmar-ui/src/main/webapp/img/logo.gif | Bin 0 -> 4274 bytes coselmar-ui/src/main/webapp/index.html | 44 ++-- .../src/main/webapp/js/coselmar-controllers.js | 137 +++++++---- .../src/main/webapp/js/coselmar-user-services.js | 18 +- coselmar-ui/src/main/webapp/js/coselmar.js | 6 +- .../src/main/webapp/views/documents/documents.html | 57 ++--- .../main/webapp/views/documents/editDocument.html | 123 ++++++---- .../webapp/views/documents/modalDocumentEdit.html | 16 +- .../main/webapp/views/documents/newdocument.html | 101 ++++---- .../main/webapp/views/documents/viewDocument.html | 193 +++++++++------ coselmar-ui/src/main/webapp/views/home.html | 25 +- .../main/webapp/views/questions/closeQuestion.html | 17 +- .../main/webapp/views/questions/editquestion.html | 193 ++++++++------- .../views/questions/modalQuestionSearch.html | 2 +- .../main/webapp/views/questions/newquestion.html | 9 +- .../src/main/webapp/views/questions/question.html | 27 ++- .../src/main/webapp/views/questions/questions.html | 101 ++++---- .../main/webapp/views/questions/viewquestion.html | 249 +++++++++---------- .../main/webapp/views/referential/referential.html | 133 ++++++----- .../src/main/webapp/views/users/adminUsers.html | 131 +++------- .../src/main/webapp/views/users/edituser.html | 9 +- .../src/main/webapp/views/users/newPassword.html | 53 ++++ .../src/main/webapp/views/users/newuser.html | 1 + .../src/main/webapp/views/users/searchPart.html | 122 ++++++++++ .../main/webapp/views/users/supervisorUsers.html | 133 +++-------- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- pom.xml | 2 +- 57 files changed, 1694 insertions(+), 1087 deletions(-) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserAccountCreatedMail.java => AbstractMail.java} (65%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserAccountCreatedMail.java => LostPasswordMail.java} (58%) copy coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/{UserAccountCreatedMail.java => UserPasswordChangedMail.java} (58%) create mode 100644 coselmar-rest/src/main/resources/mail/LostPasswordMail.mustache create mode 100644 coselmar-rest/src/main/resources/mail/LostPasswordMail_fr.mustache create mode 100644 coselmar-rest/src/main/resources/mail/UserPasswordChangedMail.mustache create mode 100644 coselmar-rest/src/main/resources/mail/UserPasswordChangedMail_fr.mustache create mode 100644 coselmar-ui/src/main/webapp/img/StatusIcons.png create mode 100644 coselmar-ui/src/main/webapp/img/logo.gif create mode 100644 coselmar-ui/src/main/webapp/views/users/newPassword.html create mode 100644 coselmar-ui/src/main/webapp/views/users/searchPart.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.