This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c6b0f1a75336d90cd57e419b67bbd40de7224a98 Merge: 8462307 3b7c516 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 15:35:24 2016 +0100 [REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut (refs-80 #8391) Merge branch 'feature/8391' into develop .../SpeciesDto-ui-create-error-validation.xml | 11 +++ .../SpeciesDto-ui-update-error-validation.xml | 10 +++ .../application-swing-validation_en_GB.properties | 1 + .../application-swing-validation_es_ES.properties | 1 + .../application-swing-validation_fr_FR.properties | 1 + .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++-- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 22 +++-- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 5 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 1 + .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++-- .../DataSourceMigrationForVersion_5_1.java | 99 +++++++++++++++++++-- ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 2 + ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 2 + entities/src/main/xmi/observe-common.zargo | Bin 37986 -> 38441 bytes .../ReferentialReferenceSetDefinitions.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42563 -> 42688 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../Species-service-error-validation.xml | 10 +++ .../services-topia-validation_en_GB.properties | 1 + .../services-topia-validation_es_ES.properties | 1 + .../services-topia-validation_fr_FR.properties | 1 + .../topia/binder/referential/SpeciesBinder.java | 10 ++- 22 files changed, 176 insertions(+), 43 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.