- Wao-commits - mailman.cloud.codelutin.com

branch develop updated (5b554cb -> dfd5d32)
by codelutin.com scm 18 Feb '15

18 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 5b554cb On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) new 6c353e5 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) new dfd5d32 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) The 2 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 dfd5d324107dbf2987043a07b139119356acee5e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 14:49:19 2015 +0100 Erreur de frappe dans le choix des paramètres à mesurer (testable-client #6681) commit 6c353e568e98dfe123945670322e9465352b8253 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 14:48:00 2015 +0100 Manque un espace dans le filtre espèce entre le nom latin et la parenthèse (testable-client #6680) Summary of changes: .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (aa3b322 -> 5b554cb)
by codelutin.com scm 18 Feb '15

18 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from aa3b322 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5b554cb On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) 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 5b554cb035f58f547118fb495ea6727a3e91f022 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Feb 18 14:44:31 2015 +0100 On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) Summary of changes: wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- .../src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (64f3e3d -> aa3b322)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) new e9de68c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions new 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions new 29a5c2b Merge branch 'release/5.0-RC4' new 9f71c77 Merge branch 'master' into develop new aa3b322 [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 aa3b322c41ff1756cf410bfc1ef9396ac61b38d8 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9f71c773a19f091eaad5d89fd889ce0f79f0f7a8 Merge: e9de68c 29a5c2b Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 Merge branch 'master' into develop commit e9de68c4c880842f679d5279ccec5d10612bc860 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 29a5c2bbaf378180ea48b058cbeb3eee86c5e575 Merge: ff93260 274da5a Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:07:44 2015 +0000 Merge branch 'release/5.0-RC4' commit 274da5a82d14edf246679ab826b2edbe801242e8 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:05:14 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' 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/5.0-RC4 deleted (was 274da5a)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git was 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' 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 wao-5.0-RC4 created (now 34f202f)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git at 34f202f (tag) tagging 29a5c2bbaf378180ea48b058cbeb3eee86c5e575 (commit) replaces wao-5.0-RC3 tagged by Maven Release on Fri Feb 13 14:07:44 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.0-RC4 ----------------------------------------------------------------------- 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/5.0-RC4 updated (cfd8f88 -> 274da5a)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git from cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions adds 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 (ff93260 -> 29a5c2b)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from ff93260 Merge branch 'release/5.0-RC3' adds 52ea7b4 Dans l'onglet Navires, on ne doit pas voir les navires Scléro (testable-client #6658) adds cb06485 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a48664a Merge branch 'master' into develop adds 09464e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 728c958 Mise à jour de develop local après release adds 5d7bcdc Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) adds 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) adds cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions adds 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions adds 29a5c2b Merge branch 'release/5.0-RC4' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 ++ .../entity/SclerochronologySamplingContext.java | 16 +++++++++++++-- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ wao-services/pom.xml | 2 +- .../service/administration/WaoUsersList.java | 2 +- wao-web/pom.xml | 2 +- .../wao/web/action/AbstractImportCsvAction.java | 2 +- 9 files changed, 46 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 5.0-RC4 released
by codelutin.com Release Notification 13 Feb '15

13 Feb '15

The Wao team is pleased to announce the wao-5.0-RC4 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o On peut voir les navires fictifs scléro dans l'onglet Navires de Obsmer et ObsVente Issue: 6658. Thanks to Brendan Le Ny. Resolved by bleny. o Impossible de créer kelig m.... Issue: 6666. Thanks to Vincent BADTS. Resolved by bleny. o Impossible d'importer le référentiel espèce Issue: 6664. Thanks to Brendan Le Ny. Resolved by vbadts. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-5.0-RC4.war - http://forge.codelutin.com/attachments/download/2881 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/5.0-RC4 created (now cfd8f88)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC4 in repository wao. See http://git.codelutin.com/wao.git at cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions This branch includes the following new commits: new cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' 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 cfd8f8818217d467042f0757ddd7adeb3feb4f51 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Feb 13 14:01:39 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' 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 (728c958 -> 64f3e3d)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 728c958 Mise à jour de develop local après release new 5d7bcdc Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) new 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) The 2 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 64f3e3d3cc1d9ce231bf5ee3b06d4f985ffe0d51 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Feb 13 14:57:39 2015 +0100 On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) commit 5d7bcdc5d940f325c330a05a1a2a6bb9ccdb3502 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Feb 13 14:54:09 2015 +0100 Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) Summary of changes: .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ .../service/administration/WaoUsersList.java | 2 +- .../wao/web/action/AbstractImportCsvAction.java | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2