This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from dfaa79d Correction d'une NPE potentielle new 109f65b Correction clé bundle new 0a84939 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres new 38ed029 Nom de variable new 1342d6f Passage de la synthèse scléro en trimestres new 16a9054 Filtres pour la synthèse scléro new 9480d83 Synthèses pour la sclérochronologie (fixes #2265) The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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) commit 16a9054c7c8c8a5cfa76c7c13fa9fe8494e4e8a3 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 18:12:33 2015 +0100 Filtres pour la synthèse scléro commit 1342d6fa60c2fcfa621d1d3d4aeb401494b70129 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 18:08:26 2015 +0100 Passage de la synthèse scléro en trimestres commit 38ed0298eb7ca6f2d5c46f0b3e6973fe7172c29a Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 15:51:17 2015 +0100 Nom de variable commit 0a84939e86d17c8c65019f1f7c5948f12efd203c Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 15:23:56 2015 +0100 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres commit 109f65b549b48497fd8ce2cfce599c840f898e54 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Jan 14 12:05:30 2015 +0100 Correction clé bundle Summary of changes: .../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>.