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 c5b48f80acb78501625412961663ad3c65b83159 Merge: dcd3eff cbfefbf Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 17:47:20 2015 +0100 Merge branch 'feature/6439-reinit-password' into develop ...erAccountCreatedMail.java => AbstractMail.java} | 33 ++-------------- ...countCreatedMail.java => LostPasswordMail.java} | 46 +++------------------- .../coselmar/beans/UserAccountCreatedMail.java | 40 +------------------ .../coselmar/services/v1/UsersWebService.java | 39 +++++++++++++++--- .../main/resources/mail/LostPasswordMail.mustache | 13 ++++++ .../resources/mail/LostPasswordMail_fr.mustache | 13 ++++++ coselmar-rest/src/main/resources/mapping | 1 + .../coselmar/services/UsersWebServiceTest.java | 23 +++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 7 ++++ coselmar-ui/src/main/webapp/i18n/fr.js | 7 ++++ coselmar-ui/src/main/webapp/index.html | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 31 ++++++++++++++- .../src/main/webapp/js/coselmar-user-services.js | 18 ++++++++- coselmar-ui/src/main/webapp/js/coselmar.js | 6 ++- .../src/main/webapp/views/users/newPassword.html | 30 ++++++++++++++ 15 files changed, 191 insertions(+), 118 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.