[tutti] branch master updated (e6e7c4e -> b335414)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from e6e7c4e Merge branch 'release/3.7.3' adds db29ac1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ebe5ef0 Merge branch 'master' into develop adds e17cba0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 17c4da0 fix gitignore adds fe0fa0d change the test data directory adds 4c4dde9 updates libraries adds 7f31831 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon adds 77f7b60 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs adds 02fb1cb fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs adds 49c3cff clean code adds 8d6645d fix developer ids + use codelutinpom stable and jaxx snapshot adds f92b560 use adagio 3.6.3 adds 3262b45 back to last stable of jaxx adds ed5fd45 fixes #5791: [EXPORT] export pupitri, le ticket #5735 n'a pas corrigé le problème en 3.7.3 adds 6a9cacb fixes #5786: [CAPTURE] disfonctionnements dans saisie des poids et nombres dans l'écran mensuration en 3.7.3 adds 4ab3ac4 fixes #5803: [AIDE] le lien https://doc.codelutin.com/tutti/tutti-ui-swing derrière Aide/Site est inaccessible adds 0783eb2 fixes #5800: [CAPTURE] bug création espèce VRAC HVRAC quand modification de la catégorisation dans le tableau adds 2bb5f05 update db version adds 9767c1f [jgitflow-maven-plugin]updating poms for branch '3.7.4' with snapshot versions adds 0d2f4e4 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' with non-snapshot versions adds b335414 Merge branch 'release/3.7.4' No new revisions were added by this update. Summary of changes: .gitignore | 3 +- README.txt | 2 + pom.xml | 32 +++---- src/site/rst/dbversions.rst | 2 + tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 101 +-------------------- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 9 +- .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../service/util/BatchPersistenceHelper.java | 44 --------- .../persistence/service/util/BatchTreeHelper.java | 38 -------- .../tutti/persistence/test/DatabaseResource.java | 64 +------------ ...ervice.technical.sanity.task.DatabaseSanityTask | 2 - ...ro.specific.ReferentialSynchroSpecificTableTask | 2 - .../i18n/tutti-persistence_en_GB.properties | 48 +--------- .../i18n/tutti-persistence_fr_FR.properties | 48 +--------- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 6 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/tutti.config | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 9 +- .../operation/catches/EditCatchesUIModel.java | 9 ++ .../operation/catches/SampleCategoryAble.java | 2 + .../catches/SampleCategoryColumnIdentifier.java | 7 ++ .../catches/benthos/BenthosBatchRowModel.java | 17 +++- .../catches/benthos/BenthosBatchTableModel.java | 16 +++- .../catches/benthos/BenthosBatchUIHandler.java | 23 +++-- .../frequency/BenthosFrequencyRowModel.java | 5 + .../frequency/BenthosFrequencyUIHandler.java | 6 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 39 ++++++-- .../catches/species/SpeciesBatchRowModel.java | 15 ++- .../catches/species/SpeciesBatchTableModel.java | 16 +++- .../catches/species/SpeciesBatchUIHandler.java | 19 +++- .../frequency/SpeciesFrequencyRowModel.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 9 +- .../species/frequency/SpeciesFrequencyUIModel.java | 39 ++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 39 files changed, 237 insertions(+), 425 deletions(-) delete mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask delete mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm