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 bbf37b7c3f4a1cf73250e62146e601a30b9221bc Merge: adcd234 29cca02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 20 14:03:14 2015 +0000 Merge branch 'release/5.2' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 14 ++- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 5 + wao-services/pom.xml | 2 +- .../service/ObsVenteSamplingPlanBuilder.java | 40 +++++-- .../wao/services/service/SynthesisService.java | 119 +++++++++++++-------- .../service/administration/WaoUsersService.java | 94 ++++++++++------ .../email/UserCredentialsEmail_fr.mustache | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../wao/services/service/ObsMerFixtures.java | 4 + .../ifremer/wao/services/service/WaoFixtures.java | 9 ++ .../administration/WaoUsersServiceTest.java | 44 ++++++++ wao-web/pom.xml | 2 +- .../java/fr/ifremer/wao/web/WaoInterceptor.java | 5 +- .../authentication/ForgottenPasswordAction.java | 91 ++++++++++++++++ .../main/resources/i18n/wao-web_en_GB.properties | 5 + .../main/resources/i18n/wao-web_fr_FR.properties | 5 + .../content/authentication/forgotten-password.jsp | 65 +++++++++++ .../WEB-INF/content/authentication/login.jsp | 18 +++- .../WEB-INF/content/edit-sample-row-input.jsp | 10 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/decorators.xml | 1 + 24 files changed, 436 insertions(+), 107 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.