- Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (d7b1e7f -> 1c38756)
by codelutin.com scm July 27, 2016

July 27, 2016

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 d7b1e7f Correction syntaxique dans un message d'erreur new 301a959 fixes #8311: [IMPORT GENERIQUE] Avertir de l'écrasement de données uniquement lorsque la campagne ou le trait existe déjà en base new 1c38756 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop The 2 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 1c38756c6bd4f91e279d63b4d9a74ed244fef06b Merge: 301a959 d7b1e7f Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Wed Jul 27 18:31:28 2016 +0200 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop commit 301a9597d44c2a041022c970e4de7f6d87fb595a Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Wed Jul 27 18:30:04 2016 +0200 fixes #8311: [IMPORT GENERIQUE] Avertir de l'écrasement de données uniquement lorsque la campagne ou le trait existe déjà en base Summary of changes: .../genericformat/GenericFormatImportUIModel.java | 4 ++-- .../actions/GenericFormatImportAction.java | 4 ++-- .../genericformat/tree/CruiseSelectTreeNode.java | 19 ++++++++++++++++ .../tree/OperationSelectTreeNode.java | 6 ++++++ .../genericformat/tree/ProgramSelectTreeNode.java | 25 +++++++++++++++++----- 5 files changed, 49 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (c1683e9 -> d7b1e7f)
by codelutin.com scm July 26, 2016

July 26, 2016

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 c1683e9 fixes #8333: [CAPTURE] enrichir le commentaire du taxon dans le cas de la gestion d'un mélange new d7b1e7f Correction syntaxique dans un message d'erreur 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 d7b1e7f706c46ef04a8f9595f304224b9c402434 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Jul 26 17:47:26 2016 +0200 Correction syntaxique dans un message d'erreur Summary of changes: .../fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (07ba128 -> c1683e9)
by codelutin.com scm July 26, 2016

July 26, 2016

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 07ba128 fixes #8402 ([VALIDATION] erreur java dans la procèdure de validation des données, merci de m'aider) new c1683e9 fixes #8333: [CAPTURE] enrichir le commentaire du taxon dans le cas de la gestion d'un mélange 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 c1683e993a459bd37f0f5cbe4b9280ecb95d4e2f Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Tue Jul 26 11:24:11 2016 +0200 fixes #8333: [CAPTURE] enrichir le commentaire du taxon dans le cas de la gestion d'un mélange Summary of changes: .../species/edit/actions/CreateSpeciesMelagAction.java | 14 ++++++++++++-- .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b2b86f1 -> 07ba128)
by codelutin.com scm July 7, 2016

July 7, 2016

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 b2b86f1 use variable defined but not used for animal-sniffer-maven-plugin new 07ba128 fixes #8402 ([VALIDATION] erreur java dans la procèdure de validation des données, merci de m'aider) 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 07ba1280c4a9da027ca0131b1bb219468ff045fc Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Thu Jul 7 19:24:04 2016 +0200 fixes #8402 ([VALIDATION] erreur java dans la procèdure de validation des données, merci de m'aider) Summary of changes: .../species/frequency/SpeciesFrequencyUIHandler.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (8713385 -> b2b86f1)
by codelutin.com scm July 6, 2016

July 6, 2016

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 8713385 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new b2b86f1 use variable defined but not used for animal-sniffer-maven-plugin 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 b2b86f11121cb7532ed05cf0cbb5bb096715daf3 Author: Benjamin POUSSIN <poussin(a)codelutin.com> Date: Wed Jul 6 17:26:45 2016 +0200 use variable defined but not used for animal-sniffer-maven-plugin Summary of changes: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.5.5 deleted (was 3eb2927)
by codelutin.com scm June 28, 2016

June 28, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5.5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 3eb2927 fixes header and i18n file The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-4.5.5 created (now 2784238)
by codelutin.com scm June 28, 2016

June 28, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5.5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 2784238 (tag) tagging bd2cea103f37188ce2ad212d8a531150a2b2a8f5 (commit) replaces tutti-4.5.4 tagged by Maven Release on Tue Jun 28 17:44:34 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5.5 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (d5beb1c -> 8713385)
by codelutin.com scm June 28, 2016

June 28, 2016

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 d5beb1c [jgitflow-maven-plugin]updating poms for 4.6-SNAPSHOT development new 95ec88c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b388fb8 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions new 3eb2927 fixes header and i18n file new bd2cea1 [jgitflow-maven-plugin]merging 'release/4.5.5' into 'master' new 82bb5a4 [jgitflow-maven-plugin]merging 'master' into 'develop' new 8713385 [jgitflow-maven-plugin]Updating develop poms back to pre merge state 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 8713385e7f4bad16131ae17e96addc3534943b1e Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jun 28 17:44:37 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 82bb5a46ec6075428c029ee6e2203046d5e10cc9 Merge: 95ec88c bd2cea1 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jun 28 17:44:36 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 95ec88ce25a03a1c77a86da3daa2a14855f76461 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jun 28 17:44:36 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bd2cea103f37188ce2ad212d8a531150a2b2a8f5 Merge: 78bf27f 3eb2927 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jun 28 17:44:33 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.5' into 'master' commit 3eb2927762993e25a136dee31a7bee62e56e3da0 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jun 28 16:38:46 2016 +0200 fixes header and i18n file commit b388fb8eb8a5937a661218f95ab540228d248dc6 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Jun 28 16:21:42 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions Summary of changes: .../swing/content/actions/FixesBatchRankOrder.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + 2 files changed, 25 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch release/4.5.5 updated (c55a64c -> 3eb2927)
by codelutin.com scm June 28, 2016

June 28, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5.5 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from c55a64c fixes #8367 (lengthStepInMm n'est pas calculé en Step) adds b388fb8 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions adds 3eb2927 fixes header and i18n file No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/actions/FixesBatchRankOrder.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + 10 files changed, 33 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (78bf27f -> bd2cea1)
by codelutin.com scm June 28, 2016

June 28, 2016

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 78bf27f [jgitflow-maven-plugin]merging 'release/4.5.4' into 'master' adds e88e3ea [jgitflow-maven-plugin]updating poms for 4.5.5-SNAPSHOT development adds e3e59ca [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds eac74d3 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 481e5d5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e2823c3 add class to reorder all batch (remove duplicate rank_order) adds 34131b7 fixes #8314 (export espece ou export benthos, générer des noms différents) adds 11c7ce2 fixes #8304 (erreur à la suppression de lots contenant des observations indivuelles) adds fadcee0 fixes #8304 (erreur à la suppression de lots contenant des observations indivuelles) adds 91c1fe6 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop adds 91d0cfa fixes #8334 (si les poids sont saisis dans le tableau des mensurations et que on est en tri ascendant ou descendant, à l'élévation les poids n'apparaissent pas dans le tableau) adds fa9b023 Refs #8314 : Extensions des exports multipostes, correction des libellés adds 107d7ae fixes #8314 (export espece ou export benthos, générer des noms différents) Il y avait un autre menu dans les observations individuelles adds c55a64c fixes #8367 (lengthStepInMm n'est pas calculé en Step) adds b388fb8 [jgitflow-maven-plugin]updating poms for branch'release/4.5.5' with non-snapshot versions adds 3eb2927 fixes header and i18n file adds bd2cea1 [jgitflow-maven-plugin]merging 'release/4.5.5' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/sampling/CruiseSamplingCache.java | 11 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/actions/FixesBatchRankOrder.java | 164 +++++++++++++++++++++ .../catches/actions/ComputeBatchWeightsAction.java | 58 ++++---- .../species/edit/SpeciesBatchUIHandler.java | 35 ++++- .../actions/ExportMultiPostSpeciesFullAction.java | 18 ++- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 18 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 ++- .../actions/ImportMultiPostSpeciesFullAction.java | 20 ++- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 18 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 18 ++- .../actions/ExportMultiPostSpeciesFullAction.java | 17 ++- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 17 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 17 ++- .../actions/ImportMultiPostSpeciesFullAction.java | 17 ++- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 19 ++- ...ostSpeciesOnlyIndividualObservationsAction.java | 17 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 26 files changed, 434 insertions(+), 76 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/FixesBatchRankOrder.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0