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 d7d2b33 fix doc new e868c4d refs #6930 pas de rendu en html sur les traits (trop couteux) new 0d80815 fixes #6930: [IMPORT GENERIQUE] Mauvais affichage des données existantes Merge branch 'feature/6930' into develop new daee920 refs #6936 Ajout d'une colonne par catégorie pour contenir son éventuel commentaire new 9011822 fixes #6936: [IMPORT GENERIQUE] perte des commentaires à l'import Merge branch 'feature/6936' into develop new 9b794b5 refs #6940 fix NPE when removing validation result new 0fb90db refs #6904 forbids to replay import once it has be done (you need then to revalidate import) new 6af7c27 fixes #6940: [IMPORT GENERIQUE] Interdire un réimport juste après l'import Merge branch 'feature/6940' into develop The 7 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 6af7c27fa829d2dea61167e426958fe31fe701c3 Merge: 9011822 0fb90db Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 16:35:27 2015 +0200 fixes #6940: [IMPORT GENERIQUE] Interdire un réimport juste après l'import Merge branch 'feature/6940' into develop commit 0fb90db254b4992f12beeaa92651f58f6bfa76ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 16:35:24 2015 +0200 refs #6904 forbids to replay import once it has be done (you need then to revalidate import) commit 9b794b5d01562f03a1d3ffa638b49f0ae1f855c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 16:34:51 2015 +0200 refs #6940 fix NPE when removing validation result commit 90118222469675b8bd40345a2614dafb31f11b01 Merge: 0d80815 daee920 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 16:07:37 2015 +0200 fixes #6936: [IMPORT GENERIQUE] perte des commentaires à l'import Merge branch 'feature/6936' into develop commit daee9201a582a57224d1f128a27e536c4ed9018a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 16:07:28 2015 +0200 refs #6936 Ajout d'une colonne par catégorie pour contenir son éventuel commentaire commit 0d8081507f2f55aa1e30cd28501b4994c86adebd Merge: d7d2b33 e868c4d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 15:37:02 2015 +0200 fixes #6930: [IMPORT GENERIQUE] Mauvais affichage des données existantes Merge branch 'feature/6930' into develop commit e868c4ddafd60603081360e06b88a53402a0ee08 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 15:36:58 2015 +0200 refs #6930 pas de rendu en html sur les traits (trop couteux) Summary of changes: .../consumer/CsvConsumerForCatch.java | 2 ++ .../service/genericformat/csv/CatchModel.java | 10 ++++---- .../tutti/service/genericformat/csv/CatchRow.java | 22 +--------------- .../genericformat/csv/ExportSampleCategory.java | 14 +++++++++- .../producer/CsvProducerForCatch.java | 8 +++--- .../genericformat/GenericFormatImportUI.css | 7 ++++- .../genericformat/GenericFormatImportUI.jaxx | 30 +++++++++++----------- .../genericformat/GenericFormatImportUIModel.java | 3 +-- .../genericformat/tree/DataSelectTreeModel.java | 10 +++++--- .../tree/ImportDataSelectTreeCellRenderer.java | 2 +- 10 files changed, 54 insertions(+), 54 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.