This is an automated email from the git hooks/post-receive script. New change to branch feature/7608-PS-VerifEcranEchantillonsFaunesAccesoire in repository tutti. See http://git.codelutin.com/tutti.git discards de27f17 Ajout de trace dans les appels des services Ajouter un fonction pour récupéré la liste des espèces échantillonables (see #7608). discards c5f8773 Ajouter du filtre sur les espèces (see #7609). adds 32cbe03 suppression d'un paramêtre inutil (see #7609). adds 8b3648f Ajout de trace dans les appels des services (see #7609). adds 19d437d Ajouter du filtre sur les espèces (see #7609). adds 5bc9517 Merge branch 'feature/7609-VerifEcranFauneAccesoire' into 'develop' adds 2edaa0a La champs "Zone FPA actuelle" pour toutes les activité bateau sauf pour le changement de zone (see #7595) adds c2a1a06 Merge branch 'feature/7595-PS-Activite-FPAZone' into 'develop' adds 6acd0dc Ajout de trace dans les appels des services (see #7618). adds ef9d34c Ajouter du filtre sur les espèces (see #7618). adds ee92d90 sauvegarde des commentaires (see #7618). adds 6020155 Merge branch 'feature/7618-LL-VerifEcranRencontres' into 'develop' adds dc859ad Ajouter du filtre sur les espèces (see #7619). adds 64b7743 Merge branch 'feature/7619-LL-VerifEcranCapteursUtilisées' into 'develop' adds d477978 Update third parties file adds 8d06ef4 Ajout de trace dans les appels des services Ajouter un fonction pour récupéré la liste des espèces échantillonables (see #7604). adds 3ef9dc9 correcton du checkLastUpdate (see #7607). adds 9ff8a1c Fix build adds 1982207 Ajout de méthodes de filtre sur le drapeau discarded (See #7607) adds fe910b8 Faire fonctionner la sauvegarde et amélioration du code de service (See #7607) adds 899ba3f Fixes #7607 #7607 Merge branch 'feature/7607-PS-VerfiEcranEchantillonCapture' into develop adds d15184a Revert "Update third parties file" adds 2970df4 Revue des enumeration de l'ui adds d6e38bb Ajout de trace dans les appels des services Ajouter un fonction pour récupéré la liste des espèces échantillonables (see #7608). adds 9fdb1ea Correction du code de mise à jour des faune accessoires + amélioration du code (See #7608) adds 829a2ad Suppression des anciens bundles adds e0d9361 Add log This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (de27f17) \ N -- N -- N refs/heads/feature/7608-PS-VerifEcranEchantillonsFaunesAccesoire (e0d9361) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../content/open/impl/seine/ActivitySeineUI.jcss | 2 +- .../content/ref/impl/ProgramObservationEnum.java | 60 +- .../impl/longline/CatchAcquisitionModeEnum.java | 4 +- .../content/table/impl/longline/EncounterUI.jaxx | 3 +- .../table/impl/longline/EncounterUIHandler.java | 41 + .../content/table/impl/seine/CodeMesureEnum.java | 38 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 29 + .../observe-application-swing_en_GB.properties | 36 +- .../observe-application-swing_es_ES.properties | 34 +- .../observe-application-swing_fr_FR.properties | 34 +- .../resources/i18n/observe-swing_en_GB.properties | 2163 ------------------- .../resources/i18n/observe-swing_es_ES.properties | 2165 -------------------- .../resources/i18n/observe-swing_fr_FR.properties | 2158 ------------------- .../v1/seine/NonTargetCatchServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 8 + .../ird/observe/entities/seine/TargetCatchs.java | 11 + .../service/seine/NonTargetCatchService.java | 2 +- .../service/seine/TargetSampleService.java | 6 + .../services/dto/seine/TargetCatchDtos.java | 15 + .../ActivityLongLineEncouterServiceTopia.java | 10 + .../ActivityLongLineSensorUsedServiceTopia.java | 10 + .../service/seine/NonTargetCatchServiceTopia.java | 112 +- .../service/seine/TargetCatchServiceTopia.java | 110 +- .../service/seine/TargetSampleServiceTopia.java | 57 +- 26 files changed, 382 insertions(+), 6737 deletions(-) delete mode 100644 observe-application-swing/src/main/resources/i18n/observe-swing_en_GB.properties delete mode 100644 observe-application-swing/src/main/resources/i18n/observe-swing_es_ES.properties delete mode 100644 observe-application-swing/src/main/resources/i18n/observe-swing_fr_FR.properties create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm