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

branch release/5.2 deleted (was 29cca02)
by codelutin.com scm 20 Apr '15

20 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.2 in repository wao. See http://git.codelutin.com/wao.git was 29cca02 [jgitflow-maven-plugin]updating poms for branch'release/5.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-5.2 created (now 3043667)
by codelutin.com scm 20 Apr '15

20 Apr '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.2 in repository wao. See http://git.codelutin.com/wao.git at 3043667 (tag) tagging bbf37b7c3f4a1cf73250e62146e601a30b9221bc (commit) replaces wao-5.1.1 tagged by Maven Release on Mon Apr 20 14:03:14 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.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 develop updated (ff30bf4 -> a051784)
by codelutin.com scm 20 Apr '15

20 Apr '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 ff30bf4 [jgitflow-maven-plugin]updating poms for 5.3-SNAPSHOT development new dc8c7b9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 6c5c385 ajout des entêtes manquants new 29cca02 [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions new bbf37b7 Merge branch 'release/5.2' new 3475244 Merge branch 'master' into develop new a051784 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 a0517842286dcd5328063dc70abc455e385e622f Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 14:03:17 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3475244a3cba111463df3d9d4f86c3a7e1182994 Merge: dc8c7b9 bbf37b7 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 14:03:16 2015 +0000 Merge branch 'master' into develop commit dc8c7b97a39b6325c0c761e5918c41719b489ccf Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 14:03:16 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bbf37b7c3f4a1cf73250e62146e601a30b9221bc Merge: adcd234 29cca02 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 14:03:14 2015 +0000 Merge branch 'release/5.2' commit 29cca0212e5a90a8f0593cbd278856db21017381 Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 13:59:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions commit 6c5c3852869b3bea6499b33e609ff54227beff3e Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 13:57:07 2015 +0000 ajout des entêtes manquants Summary of changes: .../authentication/ForgottenPasswordAction.java | 21 +++++++++++++++++++++ .../content/authentication/forgotten-password.jsp | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch release/5.2 updated (4b26097 -> 29cca02)
by codelutin.com scm 20 Apr '15

20 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.2 in repository wao. See http://git.codelutin.com/wao.git from 4b26097 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) adds 6c5c385 ajout des entêtes manquants adds 29cca02 [jgitflow-maven-plugin]updating poms for branch'release/5.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 +- .../authentication/ForgottenPasswordAction.java | 21 +++++++++++++++++++++ .../content/authentication/forgotten-password.jsp | 20 ++++++++++++++++++++ 6 files changed, 45 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 (adcd234 -> bbf37b7)
by codelutin.com scm 20 Apr '15

20 Apr '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 adcd234 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 6955ed4 refs 6844 Remise en place de la fonctionnalité de demande de réinitialisation de mot de passe adds 8d401db Ajout d'une méthode save sur AbstractWaoTopiaDao adds 020efa1 Dans le jeu de données de test, on fait en sorte que chaque utilisateur fictif ait un mot de passe (le même pour tout le monde) adds 5d86c42 Dans le bundle i18n, on écrit en casse normale, si on veut des majuscules à l'affichage, c'est un question de style, à faire en CSS adds c256595 Pas la peine d'afficher deux boutons pour « Mot de passe oublié », pas la peine de l'afficher si la personne a réussi à s'authentifiée (étape de choix du profil ou acceptation CGU) adds c23a182 Pas besoin de surcharger input() juste pour appeller super, on définit les @Result en haut de l'action (comme dans le reste de l'appli), aucune raison d'avoir à catcher une NoRoleAttributedException à ce moment adds d53a19e Ajout d'un test pour vérifier le bon fonctionnement de la demande de renouvellement de mot de passe adds 229ead8 Remaniement de askForPasswordReminder pour réutiliser du code au sein de WaoUsersService adds 060144c Ajout d'une valeur i18n manquante adds 0afd381 Suppression de code mort (?) adds 6ff7c19 refs 6844 En cas de succes du renouvellement de mot de passe, redirection vers page de login. Si mot de passe différent d'email alors redirection vers demande d'intervention sur site adds 957035a Refs #6844 : Syntaxical correction adds 21521ad Fusion de la branche 'feature/6844-forgotenPassword' dans develop (termine #6844) adds a34e298 refs #6910 modification du calcul de l'effort, calculé pour le nombre sortie et non plus par le nombre de contactes adds 5f46ba9 refs #6910 modification du calcul de l'effort, dans l'onglet synthèse adds c0d561b refs #6910 modification de traduction adds 0f60e71 refs #6910 modification de commentaires adds 95891e5 Factorisation HTML adds aafd4fe Remaniement dans ExpectedVsActualChartTemplateMethod pour permettre de calculer le réalisé à partir de toute la liste des contacts et pas seulement pour un contact (prérequis pour compter en sorties dans ObsVente) adds 97d66bd Dans la synthèse changement du calcul du réalisé pour ObsVente en nombre de sorties et pas en nombre d'observations adds 4b26097 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) adds 6c5c385 ajout des entêtes manquants adds 29cca02 [jgitflow-maven-plugin]updating poms for branch'release/5.2' with non-snapshot versions adds bbf37b7 Merge branch 'release/5.2' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 14 ++- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 5 + wao-services/pom.xml | 2 +- .../service/ObsVenteSamplingPlanBuilder.java | 40 +++++-- .../wao/services/service/SynthesisService.java | 119 +++++++++++++-------- .../service/administration/WaoUsersService.java | 94 ++++++++++------ .../email/UserCredentialsEmail_fr.mustache | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../wao/services/service/ObsMerFixtures.java | 4 + .../ifremer/wao/services/service/WaoFixtures.java | 9 ++ .../administration/WaoUsersServiceTest.java | 44 ++++++++ wao-web/pom.xml | 2 +- .../java/fr/ifremer/wao/web/WaoInterceptor.java | 5 +- .../authentication/ForgottenPasswordAction.java | 91 ++++++++++++++++ .../main/resources/i18n/wao-web_en_GB.properties | 5 + .../main/resources/i18n/wao-web_fr_FR.properties | 5 + .../content/authentication/forgotten-password.jsp | 65 +++++++++++ .../WEB-INF/content/authentication/login.jsp | 18 +++- .../WEB-INF/content/edit-sample-row-input.jsp | 10 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/decorators.xml | 1 + 24 files changed, 436 insertions(+), 107 deletions(-) create mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ForgottenPasswordAction.java create mode 100644 wao-web/src/main/webapp/WEB-INF/content/authentication/forgotten-password.jsp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Wao 5.2 released
by codelutin.com Release Notification 20 Apr '15

20 Apr '15

The Wao team is pleased to announce the wao-5.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: New features: o OBSVENTE : Modifier libellé colonne et calcul du réalisé dans le plan d'échantillonnage Issue: 6910. Thanks to Vincent BADTS. Resolved by vbadts. Fixed Bugs: o Pas de formulaire pour une demande WAO Paramètres biologiques Issue: 6881. Thanks to Anne-Sophie Cornou. Resolved by ascornou. o Erreur création ligne plan dans WAO Obsvente Issue: 6798. Thanks to Vincent BADTS. Resolved by vbadts. o L'application ne propose plus de renvoyer un nouveau mot de passe quand la personne a perdu son mot de passe Issue: 6844. Thanks to Vincent BADTS. Resolved by bleny. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-5.2.war - http://forge.codelutin.com/attachments/download/3147 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

branch release/5.2 created (now 4b26097)
by codelutin.com scm 20 Apr '15

20 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/5.2 in repository wao. See http://git.codelutin.com/wao.git at 4b26097 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) 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 (4b26097 -> ff30bf4)
by codelutin.com scm 20 Apr '15

20 Apr '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 4b26097 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) new ff30bf4 [jgitflow-maven-plugin]updating poms for 5.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 ff30bf450eb47564d38da09488cde7a43e8d74fa Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 13:50:54 2015 +0000 [jgitflow-maven-plugin]updating poms for 5.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 (21521ad -> 4b26097)
by codelutin.com scm 20 Apr '15

20 Apr '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 21521ad Fusion de la branche 'feature/6844-forgotenPassword' dans develop (termine #6844) adds a34e298 refs #6910 modification du calcul de l'effort, calculé pour le nombre sortie et non plus par le nombre de contactes adds 5f46ba9 refs #6910 modification du calcul de l'effort, dans l'onglet synthèse adds c0d561b refs #6910 modification de traduction adds 0f60e71 refs #6910 modification de commentaires adds 95891e5 Factorisation HTML adds aafd4fe Remaniement dans ExpectedVsActualChartTemplateMethod pour permettre de calculer le réalisé à partir de toute la liste des contacts et pas seulement pour un contact (prérequis pour compter en sorties dans ObsVente) adds 97d66bd Dans la synthèse changement du calcul du réalisé pour ObsVente en nombre de sorties et pas en nombre d'observations new 4b26097 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) 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 4b260977f019b6d21a47675056d17d06af1050e4 Merge: 21521ad 97d66bd Author: Maven Release <maven-release(a)codelutin.com> Date: Mon Apr 20 13:37:53 2015 +0000 fusion de la banche 'feature/6910-obsVente-effort-bis' sur develop (termine #6910) Summary of changes: .../service/ObsVenteSamplingPlanBuilder.java | 40 +++++-- .../wao/services/service/SynthesisService.java | 119 +++++++++++++-------- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../WEB-INF/content/edit-sample-row-input.jsp | 10 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- 6 files changed, 115 insertions(+), 58 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6910-obsVente-effort-bis created (now 97d66bd)
by codelutin.com scm 10 Apr '15

10 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6910-obsVente-effort-bis in repository wao. See http://git.codelutin.com/wao.git at 97d66bd Dans la synthèse changement du calcul du réalisé pour ObsVente en nombre de sorties et pas en nombre d'observations This branch includes the following new commits: new a34e298 refs #6910 modification du calcul de l'effort, calculé pour le nombre sortie et non plus par le nombre de contactes new 5f46ba9 refs #6910 modification du calcul de l'effort, dans l'onglet synthèse new c0d561b refs #6910 modification de traduction new 0f60e71 refs #6910 modification de commentaires new 95891e5 Factorisation HTML new aafd4fe Remaniement dans ExpectedVsActualChartTemplateMethod pour permettre de calculer le réalisé à partir de toute la liste des contacts et pas seulement pour un contact (prérequis pour compter en sorties dans ObsVente) new 97d66bd Dans la synthèse changement du calcul du réalisé pour ObsVente en nombre de sorties et pas en nombre d'observations The 7 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 97d66bdfc7ddbc792ffda1f2b082da8225e19bb3 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Apr 10 16:41:57 2015 +0200 Dans la synthèse changement du calcul du réalisé pour ObsVente en nombre de sorties et pas en nombre d'observations commit aafd4fe689640863644082a3cdbe1060f1fa12b5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Apr 10 16:18:07 2015 +0200 Remaniement dans ExpectedVsActualChartTemplateMethod pour permettre de calculer le réalisé à partir de toute la liste des contacts et pas seulement pour un contact (prérequis pour compter en sorties dans ObsVente) commit a34e2985b5b96212719285a2f4fed88dc3bf0c14 Author: dcosse <cosse(a)codelutin.com> Date: Thu Apr 9 15:22:11 2015 +0200 refs #6910 modification du calcul de l'effort, calculé pour le nombre sortie et non plus par le nombre de contactes commit 5f46ba93b5993190e7b7225e33534c4075491967 Author: dcosse <cosse(a)codelutin.com> Date: Thu Apr 9 15:40:51 2015 +0200 refs #6910 modification du calcul de l'effort, dans l'onglet synthèse commit c0d561b4ac04844ae14d734a8d89659b59d57e76 Author: dcosse <cosse(a)codelutin.com> Date: Thu Apr 9 16:04:33 2015 +0200 refs #6910 modification de traduction commit 0f60e7199342399f59e83bc3d89bb21c8dc9668a Author: dcosse <cosse(a)codelutin.com> Date: Thu Apr 9 16:22:55 2015 +0200 refs #6910 modification de commentaires commit 95891e57f117da580fa286ba6fbe3f10fc53031c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Apr 9 17:18:00 2015 +0200 Factorisation HTML -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7