branch master updated (78bf27f -> bd2cea1)
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@codelutin.com>.
participants (1)
-
codelutin.com scm