This is an automated email from the git hooks/post-receive script. New change to branch feature/8157 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits 6f61c6a ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) omits 23c74c2 service d'export du rapport de prélèvements (refs #8157) omits 94561d5 récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) omits 614fb6d i18n adds 927e936 prise en compte du cas de l'intervalle 1 (fixes #8208) adds 9c43cc8 Merge branch 'feature/8208' into 'develop' adds f7abf93 conversion des centimetres en millimetres avant d'envoyer à l'algo de prelevements (refs #8207) adds 856ac6e Merge branch 'feature/8207' into 'develop' new 2dbbf8d i18n new 946cdbe récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) new 9b441cb service d'export du rapport de prélèvements (refs #8157) new 20ebc02 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) new 6afd5b0 i18n (fixes #8157) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6f61c6a) \ N -- N -- N refs/heads/feature/8157 (6afd5b0) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 5 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 6afd5b0048cc405368c6d4d84e7c3e9f79901874 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 1 23:34:13 2016 +0200 i18n (fixes #8157) commit 20ebc02ceb4c8b8ba71b14983e1d2c39354c8628 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 1 15:45:49 2016 +0200 ajout de l'action de rapport de prélèvement pour la campagne (refs #8157) commit 9b441cbfc69eb4197612b566b8635669db8033e7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 1 15:45:21 2016 +0200 service d'export du rapport de prélèvements (refs #8157) commit 946cdbee506fd82f8f4f41702972592a3a4e33e1 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 1 15:43:17 2016 +0200 récup du nombre de prélèvement par classe de taille pour une espece/maturité/sexe (refs #8157) commit 2dbbf8d4ce1d697fdc96bef49bd203b17ce9dc25 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 1 15:41:55 2016 +0200 i18n Summary of changes: .../main/java/fr/ifremer/tutti/util/Numbers.java | 24 ++++++++++ .../main/java/fr/ifremer/tutti/util/Weights.java | 5 +- .../service/sampling/CruiseSamplingCache.java | 56 ++++++++++++---------- .../sampling/CruiseSamplingInternalCache.java | 2 +- .../resources/i18n/tutti-service_fr_FR.properties | 3 ++ .../frequency/IndividualObservationUICache.java | 15 +++--- .../species/frequency/SpeciesFrequencyUIModel.java | 8 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 8 files changed, 78 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.