This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from a725e55 Merge branch 'release/4.0-RC4' adds 25ac3bb [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development adds dfbe35c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 423fd3b Merge branch 'master' into develop adds 63d2ef6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds eaef5a6 fix assembly release + tidy poms adds 13c4d99 fix bis release assemblies adds 118a665 renommage clef i18n (refs #7043) adds 84aaeac fixes #7043: [ObserveLL] libellé position verticale d'un tdr Merge branch 'feature/7043' into develop adds 8ee21b6 suppression du controle entre section sur la longeur d'orin (refs #7044) adds 8df17ed fixes #7044: [ObserveLL] Contrôle abusif longueur orin entre sections Merge branch 'feature/7044' into develop adds 14d6d78 correction du controle sur la durée minimale d'une calée (refsc #7070) adds a3812fb fixes #7070: [ObservePS] Le controle sur la durée d'une calée ne fonctionne pas Merge branch 'feature/7070' into develop adds aec514a refs #7071 : Cacher la carte pendant sa génération. adds bfd6a85 refs #7073 : Ajout de la clés de traduction manquante. adds 86c11dd refs #7075 : passé le modèle des paniers a l'état modifier lors de l'application d'un autre template. adds 2740996 refs #7075 : passé le modèle à l'état modifier lors de la modification de l'avançon. Enegitré l'avancon en cour de modification a l'enregistrement du schéma de palangre adds 1fb49d7 Merge branch 'feature/7075' into develop adds 36a03a0 refs #7044 : mise à jour du test adds 5a92fb4 [jgitflow-maven-plugin]updating poms for branch '4.0-RC5' with snapshot versions adds 4bb0f4b [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC5' with non-snapshot versions adds 0b35bd6 Merge branch 'release/4.0-RC5' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 3 +- .../main/java/fr/ird/observe/DecoratorService.java | 1 + .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + observe-entities/pom.xml | 3 +- observe-swing/pom.xml | 41 +++++++++++----------- .../content/impl/longline/BasketsTableModel.java | 1 + .../LonglineDetailCompositionUIHandler.java | 34 +++++++++++++----- ...onglineDetailCompositionUIValidationHelper.java | 22 ------------ .../open/impl/longline/TripLonglineUIHandler.java | 1 + .../open/impl/seine/TripSeineUIHandler.java | 1 + .../fr/ird/observe/ui/util/tripMap/TripMapUI.css | 6 ++++ .../fr/ird/observe/ui/util/tripMap/TripMapUI.jaxx | 5 ++- .../observe/ui/util/tripMap/TripMapUIHandler.java | 27 ++++++++++---- .../resources/i18n/observe-swing_en_GB.properties | 6 +--- .../resources/i18n/observe-swing_es_ES.properties | 6 +--- .../resources/i18n/observe-swing_fr_FR.properties | 4 +-- ...glineDetailCompositionValidatorServiceTest.java | 4 +-- observe-validation/pom.xml | 2 +- .../seine/SetSeine-n1-create-error-validation.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 2 +- pom.xml | 9 +++-- 23 files changed, 98 insertions(+), 85 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.