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

branch develop updated (8cb8b78 -> f005d30)
by codelutin.com scm 12 Nov '14

12 Nov '14

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 8cb8b78 [jgitflow-maven-plugin]updating poms for 4.2.3-SNAPSHOT development new 7996659 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions new 3376104 Merge branch 'release/4.2.2' new 42f1885 Merge branch 'master' into develop new f005d30 [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 f005d3045621d22a70e020f94e1612839cb9dc89 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:32 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 42f1885991ea2539309f69298493e0816fe3a7c9 Merge: 7996659 3376104 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:32 2014 +0000 Merge branch 'master' into develop commit 799665952399eb5af3d678f9efd6f2aab7562361 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:31 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 33761047bcc8747a53068a132222b38e8bcd1ec0 Merge: d2cb61f 8ed5935 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:24:30 2014 +0000 Merge branch 'release/4.2.2' commit 8ed593575212a2cda345fa77820d3bfd25bfbad0 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 11:22:19 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' 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/4.2.2 deleted (was 8ed5935)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.2 in repository wao. See http://git.codelutin.com/wao.git was 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.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 wao-4.2.2 created (now 58b7c90)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-4.2.2 in repository wao. See http://git.codelutin.com/wao.git at 58b7c90 (tag) tagging 33761047bcc8747a53068a132222b38e8bcd1ec0 (commit) replaces wao-4.2.1 tagged by Maven Release on Wed Nov 12 11:24:31 2014 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.2.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.2 updated (1ee6819 -> 8ed5935)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.2 in repository wao. See http://git.codelutin.com/wao.git from 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) adds 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' 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 (d2cb61f -> 3376104)
by codelutin.com scm 12 Nov '14

12 Nov '14

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 d2cb61f Merge branch 'release/4.2.1' adds d764db7 [jgitflow-maven-plugin]updating poms for 4.2.2-SNAPSHOT development adds fb98730 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 238c992 Merge branch 'master' into develop adds a633eaf [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5eba42d Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) adds bdb44c9 Dans le calcul du nombre de jours de mers, si la date de débarquement est à minuit, on veille à bien compter le jour d'arrivée comme jour de mer adds a9b400f Déplacement d'un assertion de test dans un verify guava adds 53a85f0 Quand on calcule les jours de mers entre deux dates comportant un changement d'heure (heure d'été/heure d'hiver), il semblerait que DateUtil.getDifferenceInDays donne un résultat faux. Réécriture de l'algo pour ne pas utiliser DateUtil. adds 8caade5 Correction du calcul des jours de mers dans le plan ObsMer : on répartit bien tous les jours du contact dans le plan (fixes #6050) adds 9c03a08 Suite à la migration (en 4.1) du champ immatriculation de Boat vers String, on a oublié de corriger le pattern d'un String.format dans une valeur i18n (fixes #6049) adds b777525 Fusion de la branche 6049 dans develop adds 68ae88c On ajoute une règle de validation pour empêcher l'erreur qui survient lorsqu'on essaie d'envoyer un mail à utilisateur inactif (fixes #6052) adds 30ff5e9 Fusion de la branche 6052 dans develop adds 1071dd4 Simplification d'une expression booléenne adds 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) adds 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) adds 8ed5935 [jgitflow-maven-plugin]updating poms for branch'release/4.2.2' with non-snapshot versions adds 3376104 Merge branch 'release/4.2.2' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 29 ++++++++++--- .../src/test/java/fr/ifremer/wao/WaoUtilsTest.java | 50 ++++++++++++++++------ wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 11 ++++- .../ifremer/wao/services/service/SamplingPlan.java | 4 +- .../mail/AddBoatToUserAllegroWalletEmail.java | 6 ++- .../AddBoatToUserAllegroWalletEmail_en.mustache | 3 +- .../AddBoatToUserAllegroWalletEmail_fr.mustache | 3 +- .../resources/i18n/wao-services_en_GB.properties | 2 +- .../resources/i18n/wao-services_fr_FR.properties | 2 +- wao-web/pom.xml | 2 +- .../action/administration/EditWaoUserAction.java | 4 ++ .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 1 + 16 files changed, 91 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 4.2.2 released
by codelutin.com Release Notification 12 Nov '14

12 Nov '14

The Wao team is pleased to announce the wao-4.2.2 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 Problème dans le mail de demande d'ajout de navires Issue: 6049. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Problème d'affichage des % dans plan d'échantillonnage Issue: 6048. Thanks to Vincent BADTS. Resolved by bleny. o Revoir le calcul des jours de mer par marée Issue: 6050. Thanks to Anne-Sophie Cornou. Resolved by bleny. o Création d'observateur Obsventes impossible Issue: 6052. Thanks to Anne-Sophie Cornou. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.2.2.war - http://forge.codelutin.com/attachments/download/2456 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/4.2.2 created (now 1ee6819)
by codelutin.com scm 12 Nov '14

12 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/4.2.2 in repository wao. See http://git.codelutin.com/wao.git at 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) 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 updated (1ee6819 -> 8cb8b78)
by codelutin.com scm 12 Nov '14

12 Nov '14

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 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) new 8cb8b78 [jgitflow-maven-plugin]updating poms for 4.2.3-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 8cb8b789b33b4a02c9b9214909ce630a5b4f1d1f Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Nov 12 10:52:04 2014 +0000 [jgitflow-maven-plugin]updating poms for 4.2.3-SNAPSHOT development 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 1

branch develop updated (83e6755 -> 1ee6819)
by codelutin.com scm 07 Nov '14

07 Nov '14

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 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) new 1ee6819 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) 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 1ee68198408f1cf706ef0b8a04841d9076d8baed Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Nov 7 10:23:25 2014 +0100 Dans le mail de demande d'ajout au portefeuille de l'observateur, on précise le programme dans le corps du mail (fixes #6049)) Summary of changes: .../wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java | 6 +++++- .../resources/email/AddBoatToUserAllegroWalletEmail_en.mustache | 3 +-- .../resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[wao] branch develop updated (30ff5e9 -> 83e6755)
by codelutin.com scm 05 Nov '14

05 Nov '14

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 30ff5e9 Fusion de la branche 6052 dans develop new 1071dd4 Simplification d'une expression booléenne new 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) 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 83e6755a5608ce8afd095c244f887cb564462ea9 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 16:31:34 2014 +0100 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) commit 1071dd45b20937efe5b10e6a10baefcd973bc768 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Nov 5 16:30:16 2014 +0100 Simplification d'une expression booléenne Summary of changes: .../java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2