This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 17e4207 fixes #6942: [IMPORT GENERIQUE] perte des cases cochées Merge branch 'feature/6942' into develop new 3557260 refs #6249 reniommage de la colonne en Lot_A_Confirmer new 6eed9e0 refs #6956 Ajout de l'option dans la configuration new 0da3fda arret de la validation si le nombre de lignes en erreur est trop grand new 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop The 4 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 3dd567ba497b74d0a634e5fd5126e93f391a3b4a Merge: 17e4207 0da3fda Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 15:23:41 2015 +0200 fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop commit 0da3fdade03312855120fc6084dce71fe62b7480 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 14:58:09 2015 +0200 arret de la validation si le nombre de lignes en erreur est trop grand commit 6eed9e0c453b86a968f2b7ae59ec6ed683c435d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 14:57:44 2015 +0200 refs #6956 Ajout de l'option dans la configuration commit 3557260da0a0f51f1ac060db4db852e8ee98fade Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 14 14:56:04 2015 +0200 refs #6249 reniommage de la colonne en Lot_A_Confirmer Summary of changes: .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++++ .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../resources/i18n/tutti-persistence_en_GB.properties | 1 + .../resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../java/fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 ++-- .../genericformat/GenericFormatCsvFileResult.java | 17 ++++++++++++++++- .../genericformat/GenericFormatImportConfiguration.java | 13 +++++++++++++ .../genericformat/GenericFormatImportRequest.java | 4 ++++ .../tutti/service/genericformat/csv/CatchModel.java | 4 ++-- .../importactions/ImportActionSupport.java | 13 +++++++++++++ .../importactions/ValidateAccidentalCatchAction.java | 11 ++++++++++- .../importactions/ValidateCatchAction.java | 11 ++++++++++- .../importactions/ValidateGearCaracteristicAction.java | 11 ++++++++++- .../ValidateIndividualObservationAction.java | 11 ++++++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++++++- .../importactions/ValidateOperationAction.java | 11 ++++++++++- .../importactions/ValidateParameterAction.java | 11 ++++++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++++++- .../resources/ftl/genericFormatValidateReport_fr.ftl | 3 +++ .../ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../genericformat/GenericFormatImportUIModel.java | 4 +++- .../actions/GenericFormatValidateAction.java | 3 ++- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 24 files changed, 157 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.