This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 37bdcc1 Refs-60 #6547: Change display of question, document, referential and users pages new 908e179 add rest services to generate new password and send it by mail new cbfefbf add ui for forgotten password new c5b48f8 Merge branch 'feature/6439-reinit-password' into develop new 2107c8d Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2107c8da7c2d088ecaf28315470137ad6abb8145 Merge: c5b48f8 37bdcc1 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 17:47:57 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop 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 commit cbfefbfa05fa15d236e7cc4a8f45713b8ae5c28e Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 17:47:06 2015 +0100 add ui for forgotten password commit 908e1799a2cc2a65d4cdb01eab7e87b64e62fc29 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 28 15:15:20 2015 +0100 add rest services to generate new password and send it by mail Summary of changes: ...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(-) 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%) 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-ui/src/main/webapp/views/users/newPassword.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.