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

branch develop updated (09464e0 -> 728c958)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

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 09464e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 52ea7b4 Dans l'onglet Navires, on ne doit pas voir les navires Scléro (testable-client #6658) new 728c958 Mise à jour de develop local après release 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 728c958deed29c976720979a262f7c0673fd533c Merge: 52ea7b4 09464e0 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 17:36:23 2015 +0100 Mise à jour de develop local après release commit 52ea7b45353990a9f6496ad4220fb8f928820315 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 17:35:27 2015 +0100 Dans l'onglet Navires, on ne doit pas voir les navires Scléro (testable-client #6658) Summary of changes: .../main/java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 ++ .../wao/entity/SclerochronologySamplingContext.java | 16 ++++++++++++++-- 2 files changed, 16 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 (55c5ddf -> 09464e0)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

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 55c5ddf Correction du build new cb06485 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds be003ef [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' with snapshot versions new a4c066f Ajout des entêtes manquants new 380f973 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' with non-snapshot versions new ff93260 Merge branch 'release/5.0-RC3' new a48664a Merge branch 'master' into develop new 09464e0 [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 09464e080371edab8123c9d7d1d32a7630d24754 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a48664a1acfe230b5019ca1b0c77b454724d5f1f Merge: cb06485 ff93260 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 Merge branch 'master' into develop commit cb064853f31dbd2d3f67ccac6f70184ccb7e2c5e Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ff93260c054fe3d12bd3c0a97757fbaa05af745b Merge: 8d78952 380f973 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 16:04:22 2015 +0000 Merge branch 'release/5.0-RC3' commit 380f9735fb3f1c37a03980a8e659e317d82bddaf Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 16:01:07 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' with non-snapshot versions commit a4c066f0425abb128c9fce7a9ed3c7548c310421 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 16:00:35 2015 +0000 Ajout des entêtes manquants Summary of changes: .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

annotated tag wao-5.0-RC3 created (now 2818128)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag wao-5.0-RC3 in repository wao. See http://git.codelutin.com/wao.git at 2818128 (tag) tagging ff93260c054fe3d12bd3c0a97757fbaa05af745b (commit) replaces wao-5.0-RC2 tagged by Maven Release on Thu Feb 12 16:04:23 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 5.0-RC3 ----------------------------------------------------------------------- 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-RC3 deleted (was 380f973)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC3 in repository wao. See http://git.codelutin.com/wao.git was 380f973 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' 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

branch release/5.0-RC3 updated (be003ef -> 380f973)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC3 in repository wao. See http://git.codelutin.com/wao.git from be003ef [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' with snapshot versions adds a4c066f Ajout des entêtes manquants adds 380f973 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 21 +++++++++++++++++++++ wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 5 files changed, 25 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 (8d78952 -> ff93260)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

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 8d78952 Merge branch 'release/5.0-RC2' adds 1e5c92f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0dff500 Merge branch 'master' into develop adds eae605a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds c2f0262 Correction d'une NPE potentielle, a priori pas de raisons qu'elles se produise (refs #6621) adds 3ec2be2 Modifier titre de l'axe y dans synthèse scléro (termine #6623) adds 5c3e714 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) adds c3c14f7 Correction du lien pour zoomer sur une ligne adds c3a1723 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) adds 67951c8 Problème dans les synthèses : à la remise à zéro des filtres, on pouvait obtenir une synthèse qui ne tenait pas contre du filtre estimé/réalisé (testable-client #6642) adds 769de12 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) adds f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) adds 88bd4db Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres adds 86d2bb9 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) adds cee2eb5 On autorise le coordinateur à filtrer le plan selon le labo adds d2a2f30 On introduit un nouveau filtre caché pour la société (testable-client #6641) adds 9eabb48 Fusion #6641 dans develop adds 55c5ddf Correction du build adds be003ef [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' with snapshot versions adds a4c066f Ajout des entêtes manquants adds 380f973 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' with non-snapshot versions adds ff93260 Merge branch 'release/5.0-RC3' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 28 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 3 ++- .../wao/entity/IndividualMeasurementStrategy.java | 5 ++++ .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 11 ++++++++ .../{LaboratoryImpl.java => SpeciesImpl.java} | 19 ++++++++------ ...ies,_add_laboratories,_add_sclerochronology.sql | 4 +++ .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 1 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62432 bytes wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 9 ++++++- .../wao/services/service/ContactsService.java | 12 +++------ .../services/service/SampleRowsFilterValues.java | 23 ++++++++++++++--- .../wao/services/service/SamplingPlanService.java | 10 +++----- .../service/SclerochronologySamplingPlan.java | 7 ++++++ .../wao/services/service/SynthesisService.java | 9 ++++++- .../service/administration/CompaniesService.java | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../SclerochronologySamplingPlanServiceTest.java | 4 +-- .../ifremer/wao/services/service/WaoFixtures.java | 9 ++++--- 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 | 3 ++- .../src/main/webapp/WEB-INF/content/contacts.jsp | 7 ++++++ .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 17 ++++++++++--- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 7 ++++++ wao-web/src/main/webapp/wao.css | 5 ++++ 32 files changed, 165 insertions(+), 48 deletions(-) copy wao-persistence/src/main/java/fr/ifremer/wao/entity/{LaboratoryImpl.java => SpeciesImpl.java} (64%) -- 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-RC3 released
by codelutin.com Release Notification Feb. 12, 2015

Feb. 12, 2015

The Wao team is pleased to announce the wao-5.0-RC3 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 Modifier titre de l'axe y dans synthèse Issue: 6623. Thanks to Vincent BADTS. Resolved by bleny. o Plan d'éch' et prélèvements : manque filtre Socité/Labo en profil coordinateur Ifremer Issue: 6641. Thanks to Vincent BADTS. Resolved by bleny. o plan d'éch' : forcer une distance minimale plus importante entre les colonnes du tableau Issue: 6639. Thanks to Vincent BADTS. Resolved by bleny. Fixed Bugs: o Erreur à la création d'un utilisateur dans admin paramètres biologiques Issue: 6621. Thanks to Vincent BADTS. Resolved by bleny. o Synthèse champ zone vide alors que on attend le choix entre X et IV (cf valeurs dans le plan d'échantillonnage) Issue: 6624. Thanks to Vincent BADTS. Resolved by bleny. o Plan d'échantillonnage : filtre espèce, mettre le nom latin comme dans le tableau Issue: 6638. Thanks to Vincent BADTS. Resolved by bleny. o Plan éch' : filtre zone à corriger Issue: 6637. Thanks to Vincent BADTS. Resolved by bleny. o Plan d'éch' : Ajouter dans le champ "Paramètres à mesurer" : Poids/Taille/Sexe/Age Issue: 6645. Thanks to Vincent BADTS. Resolved by bleny. o synthèses : filtre "réalisé" non actif Issue: 6642. 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.0-RC3.war - http://forge.codelutin.com/attachments/download/2872 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-RC3 created (now be003ef)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC3 in repository wao. See http://git.codelutin.com/wao.git at be003ef [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' with snapshot versions This branch includes the following new commits: new be003ef [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' 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 be003efc03cc493d1d2553ca83b4d7d2ba3b30da Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Feb 12 15:57:00 2015 +0000 [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' 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 (9eabb48 -> 55c5ddf)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

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 9eabb48 Fusion #6641 dans develop new 55c5ddf Correction du build 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 55c5ddfbaaa66e4de39e1b50d080444dbadf0675 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 16:44:07 2015 +0100 Correction du build Summary of changes: .../ifremer/wao/services/service/SampleRowsFilterValues.java | 11 ----------- .../service/SclerochronologySamplingPlanServiceTest.java | 4 ++-- .../java/fr/ifremer/wao/services/service/WaoFixtures.java | 9 +++++---- 3 files changed, 7 insertions(+), 17 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 (86d2bb9 -> 9eabb48)
by codelutin.com scm Feb. 12, 2015

Feb. 12, 2015

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 86d2bb9 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) new cee2eb5 On autorise le coordinateur à filtrer le plan selon le labo new d2a2f30 On introduit un nouveau filtre caché pour la société (testable-client #6641) new 9eabb48 Fusion #6641 dans develop 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 9eabb48deb50fab0d909a8f37f15a2f5458caff5 Merge: 86d2bb9 d2a2f30 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 16:13:15 2015 +0100 Fusion #6641 dans develop commit d2a2f30b5f13687adec07d8eceaa3697faabff8a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 16:12:14 2015 +0100 On introduit un nouveau filtre caché pour la société (testable-client #6641) commit cee2eb57854af5a8921bbff86c983f33303bd5d5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 11:25:45 2015 +0100 On autorise le coordinateur à filtrer le plan selon le labo Summary of changes: .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 14 ++++++++++++++ .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 3 ++- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 5 +++++ ...cies,_add_laboratories,_add_sclerochronology.sql | 4 ++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62375 -> 62432 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 9 ++++++++- .../wao/services/service/ContactsService.java | 12 +++--------- .../services/service/SampleRowsFilterValues.java | 11 +++++++++++ .../wao/services/service/SamplingPlanService.java | 10 +++------- .../service/administration/CompaniesService.java | 2 +- 10 files changed, 51 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3