January 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch master updated (b203959 -> f5125de)
by codelutin.com scm 06 Jan '16

06 Jan '16

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 b203959 [jgitflow-maven-plugin]merging 'release/4.2' into 'master' adds 2eb0f53 [jgitflow-maven-plugin]updating poms for 4.3-SNAPSHOT development adds de00a08 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 31d91de [jgitflow-maven-plugin]merging 'master' into 'develop' adds 0e8f6c5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 16e04e1 Recopie de l'intégralité de la table des transcribing item (après suppression locale) (See #6714) adds d828fd7 Merge branch 'feature/6714' into 'develop' adds b9796d6 [jgitflow-maven-plugin]updating poms for 4.2.1 branch with snapshot versions adds ea13caf [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' with non-snapshot versions adds f5125de [jgitflow-maven-plugin]merging 'release/4.2.1' 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 +- .../TuttiReferentialSynchroServiceImpl.java | 68 +++++++++++++++++++--- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 8 files changed, 68 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.2.1 released
by codelutin.com Release Notification 06 Jan '16

06 Jan '16

The Tutti team is pleased to announce the tutti-4.2.1 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 ------- No changes defined in this version. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.2.1-tools.zip - http://forge.codelutin.com/attachments/download/3582 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.2.1 created (now b9796d6)
by codelutin.com scm 06 Jan '16

06 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.1 in repository tutti. See http://git.codelutin.com/tutti.git at b9796d6 [jgitflow-maven-plugin]updating poms for 4.2.1 branch with snapshot versions This branch includes the following new commits: new b9796d6 [jgitflow-maven-plugin]updating poms for 4.2.1 branch with snapshot versions 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 b9796d64d5f831abd7d86683280b31c467777d89 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Jan 6 16:09:35 2016 +0100 [jgitflow-maven-plugin]updating poms for 4.2.1 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (0e8f6c5 -> d828fd7)
by codelutin.com scm 06 Jan '16

06 Jan '16

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 0e8f6c5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 16e04e1 Recopie de l'intégralité de la table des transcribing item (après suppression locale) (See #6714) adds d828fd7 Merge branch 'feature/6714' into 'develop' No new revisions were added by this update. Summary of changes: .../TuttiReferentialSynchroServiceImpl.java | 68 +++++++++++++++++++--- 1 file changed, 61 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 feature/7128 deleted (was 95b27f5)
by codelutin.com scm 06 Jan '16

06 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7128 in repository tutti. See http://git.codelutin.com/tutti.git was 95b27f5 modif du formatter de commentaires pour remplacer les points virgule par des points (fixes #7128) 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

branch feature/6714 created (now 16e04e1)
by codelutin.com scm 06 Jan '16

06 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/6714 in repository tutti. See http://git.codelutin.com/tutti.git at 16e04e1 Recopie de l'intégralité de la table des transcribing item (après suppression locale) (See #6714) This branch includes the following new commits: new 16e04e1 Recopie de l'intégralité de la table des transcribing item (après suppression locale) (See #6714) 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 16e04e19591b1b5536dd7d7570c13f0ff62b4d74 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Jan 6 10:43:51 2016 +0100 Recopie de l'intégralité de la table des transcribing item (après suppression locale) (See #6714) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/4.2 deleted (was a412c8a)
by codelutin.com scm 05 Jan '16

05 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2 in repository tutti. See http://git.codelutin.com/tutti.git was a412c8a [jgitflow-maven-plugin]updating poms for branch'release/4.2' 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-4.2 created (now 29fa327)
by codelutin.com scm 05 Jan '16

05 Jan '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.2 in repository tutti. See http://git.codelutin.com/tutti.git at 29fa327 (tag) tagging b203959793d9ee025dd9a216b97d3c393bceb4cb (commit) replaces tutti-4.2-rc-2 tagged by Maven Release on Tue Jan 5 19:46:37 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.2 ----------------------------------------------------------------------- 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/4.2 updated (e5173df -> a412c8a)
by codelutin.com scm 05 Jan '16

05 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2 in repository tutti. See http://git.codelutin.com/tutti.git from e5173df Termine #7857. Merge branch 'feature/7857_precision_sur_coordonnees' into develop adds 64002f5 Add missing license header adds a412c8a [jgitflow-maven-plugin]updating poms for branch'release/4.2' 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 +- .../entities/data/FishingOperationBean.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 +- 8 files changed, 31 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 updated (6a1d158 -> b203959)
by codelutin.com scm 05 Jan '16

05 Jan '16

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 6a1d158 [jgitflow-maven-plugin]merging 'release/4.2-rc-2' into 'master' adds 41c0de8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 421f97b [jgitflow-maven-plugin]merging 'master' into 'develop' adds e9d165d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 83b4bb0 wording adds 2d199d9 wording adds 5492b28 Lors du chargement d'un protocol, on remplace les taxon referents obsoletes adds d974af9 Amélioration du code de dictionnaire des taxons obstolètes et importés adds eaebd84 Remplacement des taxons référents obsolètes lors de l'import d'un protocol adds 4b07a84 Fixes #7846. o remplacement des taxons obsolètes lors du chargement du protocol o remplacement des taxons obsolètes lors de l'import du protocol Merge branch 'feature/7846_import_generique_et_taxon_obsoletes' into develop adds 95b27f5 modif du formatter de commentaires pour remplacer les points virgule par des points (fixes #7128) adds 56a6256 Merge branch 'feature/7128' into 'develop' adds 9609d17 On arrondit les composants d'une coordonnée (See #7857) adds e5173df Termine #7857. Merge branch 'feature/7857_precision_sur_coordonnees' into develop adds 64002f5 Add missing license header adds a412c8a [jgitflow-maven-plugin]updating poms for branch'release/4.2' with non-snapshot versions adds b203959 [jgitflow-maven-plugin]merging 'release/4.2' 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 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 ++ .../entities/data/FishingOperationBean.java | 52 ++++++++++++++++++++++ .../entities/protocol/TuttiProtocols.java | 4 ++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 20 +++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/csv/CommentParserFormatter.java | 2 +- ...enericFormatReferentialSpeciesImportResult.java | 38 +++++++--------- .../ImportReferentialSpeciesAction.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/home/actions/ImportProtocolAction.java | 3 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 24 +++++----- 16 files changed, 121 insertions(+), 42 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperationBean.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0