This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 18011f572900afee15e40a086273c59e53b910b6 Merge: 681dc4f 8748f39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 18:04:57 2016 +0200 livrable #8153 Merge branch 'feature/8153' into develop .../persistence/entities/CaracteristicMap.java | 2 +- .../catches/multipost/MultiPostExportContext.java | 4 +- .../catches/multipost/MultiPostImportResult.java | 36 ++ .../catches/multipost/MultiPostImportService.java | 100 ++++- .../multipost/csv/IndividualObservationRow.java | 42 +- .../csv/IndividualObservationRowModel.java | 5 + .../IndividualObservationBatchTableModel.java | 12 +- .../catches/species/BenthosBatchUISupportImpl.java | 3 +- .../catches/species/SpeciesBatchUISupportImpl.java | 3 +- .../species/SpeciesOrBenthosBatchUISupport.java | 3 +- .../frequency/SpeciesFrequencyUIHandler.java | 443 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 8 + .../ImportMultiPostSpeciesSupportAction.java | 87 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 15 files changed, 463 insertions(+), 287 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.