This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit c6dc0f8be5c326d81e8cf0f78dc4f314f6ad2b77 Merge: 22b6b6a bce2bb7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 30 14:14:42 2015 +0000 Merge branch 'release/0.7' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.