This is an automated email from the git hooks/post-receive script. New change to branch feature/7063 in repository tutti. See http://git.codelutin.com/tutti.git discards 1b70448 ajout de l'option pour lire ou non les mesures et les bips (fixes #7063) discards a07dce9 Mise à jour des librairies lutins discards 2fe7b6b correction de la lecture des voix (fixes #7063) discards 2a274cc ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) discards 0e18d57 ajout de la tonalité nulle dans la conf (refs #7063) discards 0dabe36 joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) discards c4f59f4 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds fbebf9d Mise à jour des librairies lutins adds d3f73ef Mise à jour des librairies lutins adds 677e889 [jgitflow-maven-plugin]updating poms for 4.4-SNAPSHOT development adds cbbe213 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b81f1a2 Add missing file headers adds 1b39774 [jgitflow-maven-plugin]updating poms for branch'release/4.3' with non-snapshot versions adds de8efb0 [jgitflow-maven-plugin]merging 'release/4.3' into 'master' adds 49ebb38 [jgitflow-maven-plugin]merging 'master' into 'develop' adds eab4ab7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3a178e1 upgrade jaxx verison (fixes #7924) adds 1bdf452 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8caea2d [jgitflow-maven-plugin]updating poms for 4.3.1 branch with snapshot versions adds 419d3b2 [jgitflow-maven-plugin]updating poms for branch'release/4.3.1' with non-snapshot versions adds 15285f0 [jgitflow-maven-plugin]merging 'release/4.3.1' into 'master' adds bbbaefa [jgitflow-maven-plugin]merging 'master' into 'develop' adds 97d8cec [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 17d524f Uniformisation des tailles des boutons dans les onglets (See #7926) adds 28c073f Uniformisation des tailles des boutons dans les autres écrans (See #7926) adds 9c9f795 grossissements de boutons (refs #7926) adds 2ff0b07 Merge branch 'feature/7926' into 'develop' adds a3f0f40 Correction de l'icone d'ascenseur qui a disparu (fixes #7920) adds 30823ec Alignement sur le haut pour les écrans de création (pour uniformiser avec les autres écrans de création) adds 2db8dc6 Uniformisation des tailles des boutons dans les autres écrans (See #7926) adds 89aec2c génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds 5f534b2 joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) adds 102b709 ajout de la tonalité nulle dans la conf (refs #7063) adds a13a9c5 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) adds 6a347de correction de la lecture des voix (fixes #7063) adds bf9dc9a ajout de l'option pour lire ou non les mesures et les bips (fixes #7063) adds 4a74a07 ajout des headers de license manquantes 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 (1b70448) \ N -- N -- N refs/heads/feature/7063 (4a74a07) 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: pom.xml | 6 +++--- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/dao/TaxonNameDaoTutti.java | 24 ++++++++++++++++++++++ .../persistence/dao/TaxonNameDaoTuttiImpl.java | 24 ++++++++++++++++++++++ .../protocol/CaracteristicMappingRows.java | 24 ++++++++++++++++++++++ .../entities/protocol/SpeciesProtocols.java | 24 ++++++++++++++++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 2 ++ .../category/EditSampleCategoryModelUI.jaxx | 2 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../content/cruise/GearCaracteristicsEditorUI.jaxx | 3 ++- .../tutti/ui/swing/content/db/DbManagerUI.jaxx | 2 +- .../genericformat/GenericFormatExportUI.jaxx | 2 +- .../genericformat/GenericFormatImportUI.jaxx | 18 ++++++++-------- .../content/operation/EditFishingOperationUI.jaxx | 2 +- .../content/operation/catches/EditCatchesUI.jaxx | 10 ++++----- .../catches/accidental/AccidentalBatchUI.jaxx | 3 ++- .../accidental/create/CreateAccidentalBatchUI.jaxx | 4 ++-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 2 +- .../catches/benthos/split/SplitBenthosBatchUI.jaxx | 2 +- .../IndividualObservationBatchUI.jaxx | 3 ++- .../create/CreateIndividualObservationBatchUI.jaxx | 4 ++-- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 +++- .../create/CreateMarineLitterBatchUI.jaxx | 4 ++-- .../ImportPupitriMelagWeightPopupUIModel.java | 24 ++++++++++++++++++++++ .../catches/species/ImportPupitriPopupUIModel.java | 24 ++++++++++++++++++++++ ...mportPupitriMelagWeightPopupValidateAction.java | 24 ++++++++++++++++++++++ .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 2 +- .../ui/swing/content/program/EditProgramUI.jaxx | 2 +- .../ui/swing/content/program/EditProgramUI.jcss | 4 ---- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 +- .../tutti/ui/swing/content/report/ReportUI.jaxx | 2 +- .../swing/content/validation/ValidateCruiseUI.jaxx | 4 +++- .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 24 ++++++++++++++++++++++ 40 files changed, 271 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.