This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop adds 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) adds 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) adds 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) adds 6611c70 décoration pour le résumé (refs #8152) adds 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) adds 3be764d fix merge new 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop The 1 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 4ae72803b3d9775eb30f10d13aea7d7c6031be51 Merge: dbaf1ea 3be764d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 16:44:06 2016 +0200 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop Summary of changes: .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../service/sampling/CruiseSamplingCache.java | 249 ++++++++++++++++++--- .../sampling/CruiseSamplingInternalCache.java | 98 ++++++-- .../tutti/service/sampling/SamplingEvent.java | 35 +-- .../tutti/service/sampling/SamplingListener.java | 1 + .../frequency/IndividualObservationUICache.java | 173 +++++++++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 37 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +- 10 files changed, 498 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.