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

branch release/5.0-RC3 created (now be003ef)
by codelutin.com scm 12 Feb '15

12 Feb '15

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 12 Feb '15

12 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 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 12 Feb '15

12 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 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

branch develop updated (f7553a4 -> 86d2bb9)
by codelutin.com scm 12 Feb '15

12 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 f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) new 88bd4db Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres new 86d2bb9 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) 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 86d2bb9bd2a9e8005bac526d9d2ad031a9113aa0 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 15:12:40 2015 +0100 Dans les filtres, on ajoute le nom commun en plus du nom scientifique de l'espèce (testable-client #6638) commit 88bd4dbf97146a721a2296b4681a30832543f94d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Feb 12 11:35:06 2015 +0100 Corrige un contrôle de sécurité qui fait que le coordinateur ne voit rien dans les filtres Summary of changes: .../ifremer/wao/services/service/SampleRowsFilterValues.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 (67951c8 -> f7553a4)
by codelutin.com scm 10 Feb '15

10 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 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) new 769de12 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) new f7553a4 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) 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 f7553a4dd063dcef05803c0a9e3d838af2412bc8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 16:37:40 2015 +0100 Ajout d'une stratégie d'échantillonnage Poids/Taille/Sexe/Age (termine #6645) commit 769de12d997f6e0375025a55f202011b8ecc203f Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 16:33:04 2015 +0100 Ajout d'un padding dans les cellules du corps du tableau plan d'échantillonnage scléro (testable-client #6639) Summary of changes: .../java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java | 5 +++++ .../src/main/resources/i18n/wao-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 1 + .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/wao.css | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (5c3e714 -> 67951c8)
by codelutin.com scm 10 Feb '15

10 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 5c3e714 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) new c3c14f7 Correction du lien pour zoomer sur une ligne new c3a1723 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) new 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) 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 67951c8c2ced57caefa913d683a2b6857cc47d34 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 16:13:50 2015 +0100 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) commit c3a172370ac448162f8fbb1e6505a64114bcd68e Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 15:41:47 2015 +0100 Nom latin pour l'espece dans les filtres, détail de l'espèce dans le tableau (refs #6638) commit c3c14f7948cf567d3894d96fa82f32fca231a6ed Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 14:56:06 2015 +0100 Correction du lien pour zoomer sur une ligne Summary of changes: .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 17 +++++++++++++++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62375 bytes .../services/service/SampleRowsFilterValues.java | 2 +- .../service/SclerochronologySamplingPlan.java | 7 +++++++ .../wao/services/service/SynthesisService.java | 1 + .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 10 +++++++--- 7 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (3ec2be2 -> 5c3e714)
by codelutin.com scm 10 Feb '15

10 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 3ec2be2 Modifier titre de l'axe y dans synthèse scléro (termine #6623) new 5c3e714 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) 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 5c3e714f664f86449e5f7bd3576e2de91e352260 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Feb 10 14:40:06 2015 +0100 Pour la scléro, ajout d'un filtre sur le code quartier de la zone de pêche (termine #6637) Summary of changes: .../src/main/java/fr/ifremer/wao/SampleRowsFilter.java | 14 ++++++++++++++ .../main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java | 6 ++++++ .../wao/services/service/SampleRowsFilterValues.java | 11 +++++++++++ wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 1 + wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 3 ++- wao-web/src/main/webapp/WEB-INF/content/contacts.jsp | 7 +++++++ .../WEB-INF/content/sclerochronology/sampling-plan.jsp | 5 +++++ wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp | 7 +++++++ 8 files changed, 53 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (eae605a -> 3ec2be2)
by codelutin.com scm 09 Feb '15

09 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 eae605a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c2f0262 Correction d'une NPE potentielle, a priori pas de raisons qu'elles se produise (refs #6621) new 3ec2be2 Modifier titre de l'axe y dans synthèse scléro (termine #6623) 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 3ec2be251d1ad48492c45fbb364eb6f1bf9569e4 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Feb 9 14:15:55 2015 +0100 Modifier titre de l'axe y dans synthèse scléro (termine #6623) commit c2f0262159149ae5c8484f4db63af6da05b52e25 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Mon Feb 9 13:59:43 2015 +0100 Correction d'une NPE potentielle, a priori pas de raisons qu'elles se produise (refs #6621) Summary of changes: .../java/fr/ifremer/wao/services/service/SynthesisService.java | 8 +++++++- .../src/main/resources/i18n/wao-services_en_GB.properties | 1 + .../src/main/resources/i18n/wao-services_fr_FR.properties | 1 + .../ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 +++- 4 files changed, 12 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 (fa68104 -> eae605a)
by codelutin.com scm 03 Feb '15

03 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 fa68104 correction des tests new 1e5c92f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1e6554d [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions adds 8622173 Ajout entête manquant adds 1b9402c [jgitflow-maven-plugin]updating poms for branch '5.0-RC2' with snapshot versions adds 4c99318 Merge branch 'release/5.0-RC2' of https://git.codelutin.com/wao into release/5.0-RC2 new 45c0606 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' with non-snapshot versions new 8d78952 Merge branch 'release/5.0-RC2' new 0dff500 Merge branch 'master' into develop new eae605a [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 eae605aec62640d869d636c8ff9acbadc70b42ee Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:27 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0dff50030ccb3cb94ee70ad8393a98314822faa9 Merge: 1e5c92f 8d78952 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:26 2015 +0000 Merge branch 'master' into develop commit 1e5c92f03a4d1937581d822907a1cf531f3c81e5 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:26 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8d789525522e43998db2dfb2d957071d2bc8d3f5 Merge: 8c8e421 45c0606 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:12:23 2015 +0000 Merge branch 'release/5.0-RC2' commit 45c06067976601f01e534d157fca9ea75d622794 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 3 14:09:44 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC2' with non-snapshot versions Summary of changes: .../fr/ifremer/wao/web/WaoI18nTextProvider.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 5

branch release/5.0-RC2 deleted (was 45c0606)
by codelutin.com scm 03 Feb '15

03 Feb '15

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