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 ec86284 Merge branch 'release/4.0-RC1' adds 7f00023 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development adds 8e6ec7c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e810999 Merge branch 'master' into develop adds 15dfa6a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds d7d2b33 fix doc adds e868c4d refs #6930 pas de rendu en html sur les traits (trop couteux) adds 0d80815 fixes #6930: [IMPORT GENERIQUE] Mauvais affichage des données existantes Merge branch 'feature/6930' into develop adds daee920 refs #6936 Ajout d'une colonne par catégorie pour contenir son éventuel commentaire adds 9011822 fixes #6936: [IMPORT GENERIQUE] perte des commentaires à l'import Merge branch 'feature/6936' into develop adds 9b794b5 refs #6940 fix NPE when removing validation result adds 0fb90db refs #6904 forbids to replay import once it has be done (you need then to revalidate import) adds 6af7c27 fixes #6940: [IMPORT GENERIQUE] Interdire un réimport juste après l'import Merge branch 'feature/6940' into develop adds 8e02ae3 refs #6931 Ajout d'un garde-fou sur le timer d'affichage des actions popups adds d4fd93f fixes #6931: [TECH] erreur après avoir supprimé un protocole Merge branch 'feature/6931' into develop adds 42a1150 refs #6942 import-export du drapeau espèce à confirmer adds 17e4207 fixes #6942: [IMPORT GENERIQUE] perte des cases cochées Merge branch 'feature/6942' into develop adds 3557260 refs #6249 reniommage de la colonne en Lot_A_Confirmer adds 6eed9e0 refs #6956 Ajout de l'option dans la configuration adds 0da3fda arret de la validation si le nombre de lignes en erreur est trop grand adds 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop adds d1af030 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions adds 6cca7a9 Merge branch 'release/4.0-RC2' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- src/site/rst/dbversions.rst | 2 ++ tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 +-- .../genericformat/GenericFormatCsvFileResult.java | 17 +++++++++- .../GenericFormatImportConfiguration.java | 13 ++++++++ .../genericformat/GenericFormatImportRequest.java | 4 +++ .../consumer/CsvConsumerForCatch.java | 4 +++ .../service/genericformat/csv/CatchModel.java | 12 ++++--- .../tutti/service/genericformat/csv/CatchRow.java | 38 ++++++++-------------- .../genericformat/csv/ExportSampleCategory.java | 14 +++++++- .../importactions/ImportActionSupport.java | 13 ++++++++ .../ValidateAccidentalCatchAction.java | 11 ++++++- .../importactions/ValidateCatchAction.java | 11 ++++++- .../ValidateGearCaracteristicAction.java | 11 ++++++- .../ValidateIndividualObservationAction.java | 11 ++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++- .../importactions/ValidateOperationAction.java | 11 ++++++- .../importactions/ValidateParameterAction.java | 11 ++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++- .../producer/CsvProducerForCatch.java | 10 +++--- .../ftl/genericFormatValidateReport_fr.ftl | 3 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 +++-- .../swing/content/config/TuttiConfigUIHandler.java | 3 ++ .../genericformat/GenericFormatImportUI.css | 7 +++- .../genericformat/GenericFormatImportUI.jaxx | 30 ++++++++--------- .../genericformat/GenericFormatImportUIModel.java | 7 ++-- .../actions/GenericFormatValidateAction.java | 3 +- .../genericformat/tree/DataSelectTreeModel.java | 10 +++--- .../tree/ImportDataSelectTreeCellRenderer.java | 2 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 8 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 42 files changed, 249 insertions(+), 81 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.