This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' adds 8385cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 24a97b1 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 320a3a0 Trim update url, because of haw theroy... (See #7946) adds 3a73396 Merge branch 'feature/7946' into 'develop' adds b740291 Ajout de l'option dans la configuration pour dicter ou non les unités (See #7948) adds 00496c3 Permettre de ne pas lire les unités l'option est désactivée (See #7948) adds 95579a0 modif du nom de la conf adds de81b68 Merge branch 'feature/ajout_option_ne_pas_lire_unite' into 'develop' adds 51d69fc rtp.a en double au lieu de float pour la précision (refs #7944) adds cda9442 reset the row list when the editor is initialised (fixes #7944) adds 78a33c8 Fixes #7944 Merge branch 'feature/7944-2' into develop adds 6abdc39 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) adds f60776f Fixes #6592 Merge branch 'feature/6592-2' into develop adds 6f5ed66 on reste sur java 7 le temps que maven-release l'est :( adds 867dfc2 [jgitflow-maven-plugin]updating poms for branch'release/4.4' with non-snapshot versions adds 1c18a9e [jgitflow-maven-plugin]merging 'release/4.4' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 10 ++++++-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++++ .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 +++++----- .../tutti/service/pupitri/PupitriImportResult.java | 26 ++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../species/actions/ImportPupitriAction.java | 2 +- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 13 ++++++----- .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++--- .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 15 +++++++----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++- .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 8 +++++-- 28 files changed, 99 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.