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 0a323bb9eeaa1608624ac12b12b6e0f238f8d147 Merge: c86bf74 1b0ff61 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Dec 21 18:13:58 2016 +0100 Merge branch 'feature/22' into 'develop' Sur certains formulaires d'édition du référentiel, on ne voit plus les codes + r… …evue des écrans du référentiel (Closes #22) See merge request !98 .../ui/content/ref/ContentI18nReferenceUI.jaxx | 16 ++++++------- .../ui/content/ref/ContentI18nReferenceUI.jcss | 8 +++++++ .../swing/ui/content/ref/impl/CountryUI.jaxx | 9 ++++--- .../swing/ui/content/ref/impl/CountryUI.jcss | 2 ++ .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 10 ++++---- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 7 +++--- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 11 ++++----- .../ui/content/ref/impl/GearCaracteristicUI.jcss | 1 + .../swing/ui/content/ref/impl/GearUI.jaxx | 19 ++++++++------- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 8 +++---- .../swing/ui/content/ref/impl/HarbourUI.jcss | 2 ++ .../content/ref/impl/LengthLengthParameterUI.jaxx | 11 ++++----- .../content/ref/impl/LengthLengthParameterUI.jcss | 3 +++ .../content/ref/impl/LengthWeightParameterUI.jaxx | 15 +++++------- .../content/ref/impl/LengthWeightParameterUI.jcss | 5 ++++ .../ref/impl/LengthWeightParameterUIModel.java | 6 +++-- .../swing/ui/content/ref/impl/OceanUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 6 ++--- .../swing/ui/content/ref/impl/OrganismUI.jcss | 1 + .../swing/ui/content/ref/impl/PersonUI.jaxx | 14 ++++------- .../swing/ui/content/ref/impl/PersonUI.jcss | 6 ++--- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 20 +++++++++------- .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 2 ++ .../swing/ui/content/ref/impl/SexUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 6 ++--- .../swing/ui/content/ref/impl/ShipOwnerUI.jcss | 1 + .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 19 ++++++++------- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 23 +++++++++--------- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 4 ++-- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 8 +++---- .../ui/content/ref/impl/VesselSizeCategoryUI.jcss | 2 ++ .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 28 ++++++++-------------- .../swing/ui/content/ref/impl/VesselUI.jaxx | 19 ++++++++------- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 7 +++--- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 4 ++-- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 4 ++-- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 4 ++-- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 4 ++-- .../content/ref/impl/longline/HookPositionUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 4 ++-- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 4 ++-- .../ref/impl/longline/LightsticksColorUI.jaxx | 4 ++-- .../ref/impl/longline/LightsticksTypeUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 4 ++-- .../ref/impl/longline/MaturityStatusUI.jaxx | 9 ++++--- .../ref/impl/longline/MaturityStatusUI.jcss | 2 ++ .../ref/impl/longline/MitigationTypeUI.jaxx | 4 ++-- .../content/ref/impl/longline/SensorBrandUI.jaxx | 7 +++--- .../content/ref/impl/longline/SensorBrandUI.jcss | 1 + .../ref/impl/longline/SensorDataFormatUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 4 ++-- .../content/ref/impl/longline/SettingShapeUI.jaxx | 4 ++-- .../ref/impl/longline/StomacFullnessUI.jaxx | 4 ++-- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 4 ++-- .../impl/longline/VesselActivityLonglineUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 4 ++-- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 4 ++-- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 4 ++-- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 4 ++-- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 4 ++-- .../ref/impl/seine/SurroundingActivityUI.jaxx | 4 ++-- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 4 ++-- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 4 ++-- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 8 +++---- .../swing/ui/content/ref/impl/seine/WindUI.jcss | 3 +++ .../application/swing/ui/util/JComment.jaxx | 2 +- 78 files changed, 243 insertions(+), 230 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.