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 ce5b98830fe1bdf0cd1f66fffe3f48f632476742 Merge: c6b0f1a 5731c8b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 16:44:59 2016 +0100 Ajout de champs liés au marquage d'individus (Fixes #8571) Merge branch 'feature/8571' into develop .../table/impl/longline/CatchLonglineUI.jaxx | 15 ++++++++++++-- .../table/impl/longline/CatchLonglineUI.jcss | 17 +++++++++++++++ .../table/impl/longline/CatchLonglineUIModel.java | 2 ++ .../content/table/impl/seine/AbstractSampleUI.jcss | 17 +++++++++++++++ .../table/impl/seine/AbstractSampleUIHandler.java | 19 +++++++++++++---- .../table/impl/seine/NonTargetSampleUI.jaxx | 15 ++++++++++++++ .../content/table/impl/seine/TargetSampleUI.jaxx | 16 ++++++++++++++ .../table/impl/seine/TargetSampleUIModel.java | 3 ++- .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../DataSourceMigrationForVersion_5_1.java | 23 ++++++++++----------- .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 3 +++ .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 3 +++ entities/src/main/xmi/observe-longline.zargo | Bin 93649 -> 93746 bytes entities/src/main/xmi/observe-seine.zargo | Bin 85870 -> 86054 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67880 -> 67946 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59857 -> 60028 bytes .../topia/binder/data/CatchLonglineBinder.java | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 2 ++ .../topia/binder/data/TargetLengthBinder.java | 2 ++ 21 files changed, 126 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.