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 8d789525522e43998db2dfb2d957071d2bc8d3f5 Merge: 8c8e421 45c0606 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 3 14:12:23 2015 +0000 Merge branch 'release/5.0-RC2' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../wao/entity/IndividualMeasurementStrategy.java | 10 ++ .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 +++ .../i18n/wao-persistence_en_GB.properties | 4 +- .../i18n/wao-persistence_fr_FR.properties | 4 +- wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 7 +- .../wao/services/service/SamplingPlanService.java | 16 +++ .../service/SclerochronologySamplingPlan.java | 2 +- .../SclerochronologySamplingPlanService.java | 44 ++++++++ .../administration/LaboratoriesService.java | 7 +- .../service/administration/WaoUsersList.java | 2 +- .../service/csv/ContactImportExportModel.java | 78 +++++++------- .../SclerochronologySamplingPlanExportModel.java | 116 +++++++++++++++++++++ .../import/contacts-sclerochronologie.csv | 2 +- .../src/test/resources/import/contacts.csv | 2 +- wao-web/pom.xml | 2 +- .../fr/ifremer/wao/web/WaoI18nTextProvider.java | 51 +++++++++ .../ExportSamplingPlanWithStatisticsAction.java | 9 +- .../action/administration/EditWaoUserAction.java | 4 +- .../main/resources/i18n/wao-web_en_GB.properties | 7 +- .../main/resources/i18n/wao-web_fr_FR.properties | 7 +- wao-web/src/main/resources/struts.xml | 2 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 4 +- .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 31 +++--- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- 29 files changed, 350 insertions(+), 89 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.