This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 21521ad790eac9f04852feb30b01f96ba734237d Merge: adcd234 957035a Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Apr 9 15:18:55 2015 +0200 Fusion de la branche 'feature/6844-forgotenPassword' dans develop (termine #6844) .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 14 ++-- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 5 ++ .../service/administration/WaoUsersService.java | 94 ++++++++++++++-------- .../email/UserCredentialsEmail_fr.mustache | 2 +- .../wao/services/service/ObsMerFixtures.java | 4 + .../ifremer/wao/services/service/WaoFixtures.java | 9 +++ .../administration/WaoUsersServiceTest.java | 44 ++++++++++ .../java/fr/ifremer/wao/web/WaoInterceptor.java | 5 +- .../authentication/ForgottenPasswordAction.java | 70 ++++++++++++++++ .../main/resources/i18n/wao-web_en_GB.properties | 5 ++ .../main/resources/i18n/wao-web_fr_FR.properties | 5 ++ .../content/authentication/forgotten-password.jsp | 45 +++++++++++ .../WEB-INF/content/authentication/login.jsp | 18 +++-- wao-web/src/main/webapp/WEB-INF/decorators.xml | 1 + 14 files changed, 276 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.