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 9480d830a28b872a361fed3d118e4e7a15405232 Merge: dfaa79d 16a9054 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 18:13:06 2015 +0100 Synthèses pour la sclérochronologie (fixes #2265) .../src/main/java/fr/ifremer/wao/WaoUtils.java | 62 ++++- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 26 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 19 +- .../wao/services/service/ContactsService.java | 3 +- .../fr/ifremer/wao/services/service/Synthesis.java | 5 +- .../wao/services/service/SynthesisService.java | 66 +++-- .../resources/i18n/wao-services_en_GB.properties | 2 +- .../main/resources/i18n/wao-web_fr_FR.properties | 4 +- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 296 ++++++++++++--------- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 16 +- 10 files changed, 307 insertions(+), 192 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.