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 fbfdd1823aaafdfbc364ba460f180dd70af82cbe Merge: fce17c4 70f001d Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 5 09:11:44 2015 +0000 Merge branch 'release/5.1' pom.xml | 14 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 19 +- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 32 +- .../java/fr/ifremer/wao/entity/SampleMonths.java | 70 --- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 51 -- .../java/fr/ifremer/wao/entity/SampleRows.java | 19 - .../ifremer/wao/entity/TargetSpeciesDcfImpl.java | 2 +- .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 3 +- wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 2 +- .../service/ContactsFilterValuesCacheKey.java | 3 +- .../service/ObsMerSamplingPlanBuilder.java | 125 +++-- .../service/ObsVenteSamplingPlanBuilder.java | 178 +++---- .../service/ObsVenteSamplingPlanService.java | 7 +- .../services/service/SampleRowsFilterValues.java | 9 +- .../fr/ifremer/wao/services/service/Synthesis.java | 34 +- .../wao/services/service/SynthesisCacheKey.java | 49 +- .../wao/services/service/SynthesisService.java | 582 +++++++++++++++++---- .../service/administration/ReferentialService.java | 2 +- .../service/csv/SamplingPlanImportExportModel.java | 10 +- .../csv/operations/MonthYearParserFormatter.java | 52 ++ .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 3 +- wao-web/pom.xml | 10 +- .../fr/ifremer/wao/web/action/SynthesisAction.java | 2 +- ...n.java => SynthesisFilterValuesJsonAction.java} | 65 +-- .../web/converter/JFreeChartToImgTagConverter.java | 2 +- .../service/Synthesis-conversion.properties | 22 - .../src/main/resources/xwork-conversion.properties | 1 + .../main/webapp/WEB-INF/content/boat-details.jsp | 4 +- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 9 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 + wao-web/src/main/webapp/wao.css | 2 +- wao-web/src/main/webapp/wao.js | 23 + 36 files changed, 891 insertions(+), 523 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.