This is an automated email from the git hooks/post-receive script. New change to branch master-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a024bdb [jgitflow-maven-plugin]merging 'release/5.1.4' into 'master-5.x' adds cd6e9ae L'écran A propos ne fonctionne pas (Fixes #8892) adds 5252001 Bug sur synchro avancée de référentiel (Fixes #8895) adds b085015 [jgitflow-maven-plugin]updating poms for 5.2-SNAPSHOT development adds 01c50b9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4015d81 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' adds 5893fee [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c740ce7 L'écran A propos ne fonctionne pas (Fixes #8892) adds 3c1197e Bug sur synchro avancée de référentiel (Fixes #8895) adds 42daadf L'écran A propos ne fonctionne pas (Fixes #8892) adds adb5e62 Il existe encore des validations qui ne passent pas (Fixes #8898) adds 1b8486e Ne pas afficher l'onglet Avancon lors de la création d'une capture (See #8859) adds 7ebce1a Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) adds 3d87074 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) (fix cherry-pick) adds cd20c8d La connexion serveur HTTPS ne fonctionne pas (Fixes #8914) adds 39c443a ajout doc windows adds 2b2c921 fix method for admin actions adds 2db769d [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions adds 328a3be [jgitflow-maven-plugin]merging 'release/5.2' into 'master-5.x' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 16 +++-- .../application/swing/ui/admin/AdminUIHandler.java | 12 ++++ .../referential/ng/ReferentialSynchroUI.jaxx | 6 -- .../table/impl/longline/CatchLonglineUI.jcss | 4 +- .../swing/ui/storage/StorageUIModel.java | 6 +- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- application-web/src/main/resources/mapping | 4 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 79 ++++++++++++++++++++++ services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../data/ActivityLonglineEncouterDtoBinder.java | 16 +---- .../data/ActivityLonglineSensorUsedDtoBinder.java | 2 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 2 +- .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- .../topia/binder/data/BaitsCompositionBinder.java | 23 ++++++- .../binder/data/BranchlinesCompositionBinder.java | 20 +++++- .../topia/binder/data/DataBinderSupport.java | 8 +-- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../binder/data/FloatlinesCompositionBinder.java | 18 ++++- .../binder/data/GearUseFeaturesLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementSeineBinder.java | 2 +- .../binder/data/GearUseFeaturesSeineBinder.java | 2 +- .../topia/binder/data/HooksCompositionBinder.java | 20 +++++- .../topia/binder/data/NonTargetLengthBinder.java | 7 +- .../topia/binder/data/NonTargetSampleBinder.java | 2 +- .../binder/data/ObjectObservedSpeciesBinder.java | 7 +- .../binder/data/ObjectSchoolEstimateBinder.java | 7 +- .../topia/binder/data/RouteStubDtoBinder.java | 2 +- .../binder/data/SetLonglineCatchDtoBinder.java | 2 +- .../SetLonglineDetailCompositionDtoBinder.java | 2 +- .../SetLonglineGlobalCompositionDtoBinder.java | 2 +- .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../topia/binder/data/SetLonglineTdrDtoBinder.java | 2 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 2 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 2 +- .../topia/binder/data/SizeMeasureBinder.java | 17 ++++- .../topia/binder/data/TargetCatchBinder.java | 15 +++- .../topia/binder/data/TargetSampleBinder.java | 2 +- .../services/topia/binder/data/TdrBinder.java | 2 +- .../binder/data/TripLonglineActivityDtoBinder.java | 2 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 2 +- .../binder/data/TripSeineGearUseDtoBinder.java | 2 +- .../topia/binder/data/WeightMeasureBinder.java | 17 ++++- services/pom.xml | 2 +- src/site/rst/administration-web.rst.vm | 17 +++++ test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 71 files changed, 324 insertions(+), 94 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.