May 2015 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (ac3ba55 -> e0be46c)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ac3ba55 lissage des traductions 2 (refs #7040) new 191df94 ajout d'un fichier d'export générique plus complet (refs #5156) new 90b1330 mise à jour de l'aide sur l'import générique (refs #5156) new 6e65029 ajout des spécifications dans l'aide (refs #5156) new e0be46c fixes #5156: Mettre à jour l'aide en ligne Merge branch 'feature/5156' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e0be46c20993488a8b49ef83efb0bde22bc168e0 Merge: ac3ba55 6e65029 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 17:24:01 2015 +0200 fixes #5156: Mettre à jour l'aide en ligne Merge branch 'feature/5156' into develop commit 6e6502906f3d1a905600d0d80968f9e4cae18ed9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 16:58:58 2015 +0200 ajout des spécifications dans l'aide (refs #5156) commit 90b1330b33128586ef81265c12309d120bcb7ea2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 16:58:36 2015 +0200 mise à jour de l'aide sur l'import générique (refs #5156) commit 191df94ec062176fe4654bbd849904e6e3f4d92a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 16:40:26 2015 +0200 ajout d'un fichier d'export générique plus complet (refs #5156) Summary of changes: tutti-ui-swing/src/main/assembly/help.xml | 8 + .../filtered-resources/tutti-help-fr.properties | 58 +- .../src/main/help/export/accidentalCatch.csv | 6 - tutti-ui-swing/src/main/help/export/catch.csv | 9 - .../src/main/help/export/exportCruise-example.zip | Bin 4327 -> 0 bytes .../src/main/help/export/gearCaracteristics.csv | 1 - .../src/main/help/export/genericFormat-example.zip | Bin 0 -> 75501 bytes .../src/main/help/export/individualObservation.csv | 12 - .../src/main/help/export/marineLitter.csv | 2 - tutti-ui-swing/src/main/help/export/operation.csv | 2 - tutti-ui-swing/src/main/help/export/parameter.csv | 19 - tutti-ui-swing/src/main/help/export/species.csv | 5 - tutti-ui-swing/src/main/help/export/survey.csv | 2 - tutti-ui-swing/src/main/help/fr/genericFormat.html | 602 ++++++--------------- tutti-ui-swing/src/main/help/fr/index.html | 6 +- tutti-ui-swing/src/main/help/fr/menu.html | 28 +- tutti-ui-swing/src/main/help/fr/navbar.js | 6 +- tutti-ui-swing/src/main/help/fr/selectCruise.html | 8 - 18 files changed, 242 insertions(+), 532 deletions(-) delete mode 100644 tutti-ui-swing/src/main/help/export/accidentalCatch.csv delete mode 100644 tutti-ui-swing/src/main/help/export/catch.csv delete mode 100644 tutti-ui-swing/src/main/help/export/exportCruise-example.zip delete mode 100644 tutti-ui-swing/src/main/help/export/gearCaracteristics.csv create mode 100644 tutti-ui-swing/src/main/help/export/genericFormat-example.zip delete mode 100644 tutti-ui-swing/src/main/help/export/individualObservation.csv delete mode 100644 tutti-ui-swing/src/main/help/export/marineLitter.csv delete mode 100644 tutti-ui-swing/src/main/help/export/operation.csv delete mode 100644 tutti-ui-swing/src/main/help/export/parameter.csv delete mode 100644 tutti-ui-swing/src/main/help/export/species.csv delete mode 100644 tutti-ui-swing/src/main/help/export/survey.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop-3.x updated (872de0a -> 953d002)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 872de0a [jgitflow-maven-plugin]updating poms for 3.13.13-SNAPSHOT development new 797321c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 9682094 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions new 9087285 Merge branch 'release/3.13.12' into master-3.x new d6e69c6 Merge branch 'master-3.x' into develop-3.x new 953d002 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 953d002afdbb20e4f97c48a80e22ded345298510 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 1 11:34:41 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d6e69c6f665ef45c9ccaf3631f753d2ada81dc64 Merge: 797321c 9087285 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 1 11:34:40 2015 +0000 Merge branch 'master-3.x' into develop-3.x commit 797321ca1227b8724c262901d734adb4086dd176 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 1 11:34:39 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9087285110de75ebdcac02ccae545e98bfa06b50 Merge: 99d2135 9682094 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 1 11:34:34 2015 +0000 Merge branch 'release/3.13.12' into master-3.x commit 9682094cee1aca9b2d3fafa0155339413679a6f4 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 1 11:25:00 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch release/3.13.12 deleted (was 9682094)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/3.13.12 in repository tutti. See http://git.codelutin.com/tutti.git was 9682094 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-3.13.12 created (now b82b373)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.13.12 in repository tutti. See http://git.codelutin.com/tutti.git at b82b373 (tag) tagging 9087285110de75ebdcac02ccae545e98bfa06b50 (commit) replaces tutti-3.13.11 tagged by Maven Release on Fri May 1 11:34:34 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.13.12 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/3.13.12 updated (903662d -> 9682094)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/3.13.12 in repository tutti. See http://git.codelutin.com/tutti.git from 903662d lissage des traductions 2 (refs #7040) adds 9682094 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master-3.x updated (99d2135 -> 9087285)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch master-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 99d2135 Merge branch 'release/3.13.11' into master-3.x adds db95b7f [jgitflow-maven-plugin]updating poms for 3.13.12-SNAPSHOT development adds 66d91da [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c17d8a1 Merge branch 'master-3.x' into develop-3.x adds 8928e4d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds d7e5c61 utilisation de la même unité que celle du modèle (refs #7039) adds 0b3be13 fixes #7039: [CAPTURE] Lespoids de captures sont tous en Kg Merge branch 'feature/7039' into develop-3.x adds 0f99c26 consolidation des espèces de tous les lots avant l'import (refs #7042) adds 197200c fixes #7042: [IMPORT BIGFIN] erreur import fichier bigfin sur lot sexé Merge branch 'feature/7042' into develop-3.x adds 9b74d5f lissage des traductions (refs #7040) adds 3ae69f3 fixes #7040: Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Merge branch 'feature/7040' into develop-3.x adds bb11bac lissage des noms d'action d'import-export (refs #6089) adds 1995381 fixes #6089: [ERGO] modification de libellés Merge branch 'feature/6089' into develop-3.x adds 903662d lissage des traductions 2 (refs #7040) adds 9682094 [jgitflow-maven-plugin]updating poms for branch'release/3.13.12' with non-snapshot versions adds 9087285 Merge branch 'release/3.13.12' into master-3.x No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 15 ++++- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/action/ExportAllCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolBenthosAction.java | 2 +- .../action/ExportProtocolCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolSpeciesAction.java | 2 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 2 +- .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../action/ImportProtocolCaracteristicAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../operation/catches/EditCatchesSvgHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 69 +++++++++++----------- 19 files changed, 72 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 3.13.12 released
by codelutin.com Release Notification May 1, 2015

May 1, 2015

The Tutti team is pleased to announce the tutti-3.13.12 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://tutti.codelutin.com Changes ------- Changes in this version include: New features: o Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Issue: 7040. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] modification de libellés Issue: 6089. Thanks to Vincent BADTS. Resolved by tchemit. Fixed Bugs: o [CAPTURE] Les poids de capture sont tous en Kg Issue: 7039. Thanks to Tony Chemit. Resolved by tchemit. o [IMPORT BIGFIN] erreur import fichier bigfin sur lot sexé Issue: 7042. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-3.13.12-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/3188 * tutti-3.13.12-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/3189 * tutti-ichtyometer-3.13.12-tools.zip - http://forge.codelutin.com/attachments/download/3190 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/3.13.12 created (now 903662d)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/3.13.12 in repository tutti. See http://git.codelutin.com/tutti.git at 903662d lissage des traductions 2 (refs #7040) No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop-3.x updated (903662d -> 872de0a)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 903662d lissage des traductions 2 (refs #7040) new 872de0a [jgitflow-maven-plugin]updating poms for 3.13.13-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 872de0af237f97283df4d040d8d81393046f2b9a Author: Maven Release <maven-release(a)codelutin.com> Date: Fri May 1 11:15:22 2015 +0000 [jgitflow-maven-plugin]updating poms for 3.13.13-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop-3.x updated (3ae69f3 -> 903662d)
by codelutin.com scm May 1, 2015

May 1, 2015

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from 3ae69f3 fixes #7040: Les libéllés dans les onglets espèces - benthos - macro-déchets non cohérent avec l'écran résumé Merge branch 'feature/7040' into develop-3.x new bb11bac lissage des noms d'action d'import-export (refs #6089) new 1995381 fixes #6089: [ERGO] modification de libellés Merge branch 'feature/6089' into develop-3.x new 903662d lissage des traductions 2 (refs #7040) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 903662d7991f7f537046ba2bbd2b0ca283d75859 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 12:37:11 2015 +0200 lissage des traductions 2 (refs #7040) commit 19953810c109a6edef0950ba878cf31a5ccd4bc0 Merge: 3ae69f3 bb11bac Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 12:27:26 2015 +0200 fixes #6089: [ERGO] modification de libellés Merge branch 'feature/6089' into develop-3.x commit bb11bac2c28b943eaec0b7b6902e4a1561f690ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri May 1 12:27:23 2015 +0200 lissage des noms d'action d'import-export (refs #6089) Summary of changes: .../swing/action/ExportAllCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolBenthosAction.java | 2 +- .../action/ExportProtocolCaracteristicAction.java | 2 +- .../swing/action/ExportProtocolSpeciesAction.java | 2 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 2 +- .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../action/ImportProtocolCaracteristicAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 67 +++++++++++----------- 10 files changed, 49 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3