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

branch develop updated (153e83d -> 880fd0a)
by codelutin.com scm 23 Jan '15

23 Jan '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 153e83d Correction d'un décalage provoqué par une textarea trop large (fixes #6487) new 660b269 On supprime les appels à findByTopiaId new 880fd0a Correction du formulaire de création de ligne ObsVente (fixes #6500) 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 880fd0afd09c4b6302e077a691d7eb8a0fa7f9e0 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Jan 23 11:07:18 2015 +0100 Correction du formulaire de création de ligne ObsVente (fixes #6500) commit 660b269d892d61e759e804d3972cb6e6e30ee722 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Thu Jan 22 10:44:37 2015 +0100 On supprime les appels à findByTopiaId Summary of changes: .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 23 +++++++++++--- .../ifremer/wao/services/service/BoatsService.java | 4 +-- .../wao/services/service/SamplingPlanService.java | 37 +++++++--------------- .../services/service/UpdateSampleRowCommand.java | 9 ++++++ .../service/administration/CompaniesService.java | 4 +-- .../administration/LaboratoriesService.java | 2 +- .../service/administration/NewsService.java | 4 +-- .../administration/OrganisationsService.java | 2 +- .../service/administration/WaoUsersService.java | 4 +-- .../WEB-INF/content/edit-sample-row-input.jsp | 6 ++++ 10 files changed, 54 insertions(+), 41 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 (95de1fb -> 153e83d)
by codelutin.com scm 21 Jan '15

21 Jan '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 95de1fb Correction OGNL (refs #6393) new 153e83d Correction d'un décalage provoqué par une textarea trop large (fixes #6487) 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 153e83ddb53e0722706d98b96ea47cd9635cfe0a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 17:21:04 2015 +0100 Correction d'un décalage provoqué par une textarea trop large (fixes #6487) Summary of changes: wao-web/src/main/webapp/wao.css | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (085fa9e -> 95de1fb)
by codelutin.com scm 21 Jan '15

21 Jan '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 085fa9e Ne pas masquer la vue entre labo appartenant à la même société (fixes #6490) new 95de1fb Correction OGNL (refs #6393) 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 95de1fb5247205741ab4077958044801c29de1ca Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 17:02:06 2015 +0100 Correction OGNL (refs #6393) Summary of changes: .../src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 1 file changed, 1 insertion(+), 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 (47e2e0a -> 085fa9e)
by codelutin.com scm 21 Jan '15

21 Jan '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 47e2e0a On affiche les boutons volants au dessus du bandeau d'avertissement (fixes #6494)) new 1305cc5 On partage les informations entre laboratoires new 94e7bd8 On permet la création de contacts que pour les membres du labo affecté à la ligne new 7987520 mend new 085fa9e Ne pas masquer la vue entre labo appartenant à la même société (fixes #6490) The 4 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 085fa9eb010220b04d2169d259659e457432f95f Merge: 47e2e0a 7987520 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 15:56:34 2015 +0100 Ne pas masquer la vue entre labo appartenant à la même société (fixes #6490) commit 79875200af6fd3cae746405040aa43ff995fcaef Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 15:54:32 2015 +0100 mend commit 94e7bd8f1d593d96608d89d75110b013fa1249f5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 15:45:44 2015 +0100 On permet la création de contacts que pour les membres du labo affecté à la ligne commit 1305cc55a8346e69a5bdd0f8647365231adcd34d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 16:22:38 2015 +0100 On partage les informations entre laboratoires Summary of changes: .../ifremer/wao/services/AuthenticatedWaoUser.java | 8 +++++ .../wao/services/service/ContactsService.java | 32 +++++++++++++----- .../ifremer/wao/services/service/SamplingPlan.java | 2 +- .../wao/services/service/SamplingPlanService.java | 15 +++++---- .../service/SclerochronologySamplingPlan.java | 7 ++++ .../SclerochronologySamplingPlanServiceTest.java | 2 +- .../main/webapp/WEB-INF/content/boat-details.jsp | 38 ++++++++++++---------- .../content/sclerochronology/sampling-plan.jsp | 2 +- 8 files changed, 69 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/6393 created (now a53a891)
by codelutin.com scm 21 Jan '15

21 Jan '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6393 in repository wao. See http://git.codelutin.com/wao.git at a53a891 prototype pour un bouton pour tout sélectionner dans un filtre This branch includes the following new commits: new a53a891 prototype pour un bouton pour tout sélectionner dans un filtre 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 a53a89184f40c164cea6116c6067b1f60d7d6ced Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 21 11:59:18 2015 +0100 prototype pour un bouton pour tout sélectionner dans un filtre -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (b1d3b08 -> 47e2e0a)
by codelutin.com scm 20 Jan '15

20 Jan '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 b1d3b08 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) new 47e2e0a On affiche les boutons volants au dessus du bandeau d'avertissement (fixes #6494)) 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 47e2e0ab97e0a7af0740c146b1b4a4e1ffbb58f1 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 17:20:36 2015 +0100 On affiche les boutons volants au dessus du bandeau d'avertissement (fixes #6494)) Summary of changes: wao-web/src/main/webapp/wao.css | 3 ++- 1 file changed, 2 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 (29a6950 -> b1d3b08)
by codelutin.com scm 20 Jan '15

20 Jan '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 29a6950 On évite un échappement (fixes #6488) new 5bd58fb Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) new b1d3b08 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) 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 b1d3b087f97ea09115bc391309c0dc7c7daba346 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 16:31:56 2015 +0100 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) commit 5bd58fb07a845c7a69a1f5708ea39a1f82fb28d5 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 16:27:01 2015 +0100 Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) Summary of changes: .../src/main/webapp/WEB-INF/content/administration/companies.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp | 9 --------- 2 files changed, 1 insertion(+), 10 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 (9480d83 -> 29a6950)
by codelutin.com scm 20 Jan '15

20 Jan '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 9480d83 Synthèses pour la sclérochronologie (fixes #2265) new 15c4c06 Correction d'une NPE à l'export du plan scléro (fixes #6486) new 29a6950 On évite un échappement (fixes #6488) 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 29a69501cd20f45849fdc3c635046e8f24da6e48 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 15:03:06 2015 +0100 On évite un échappement (fixes #6488) commit 15c4c064c10d0cf318d1ca473e2e6cdb2d62e59d Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Tue Jan 20 14:56:41 2015 +0100 Correction d'une NPE à l'export du plan scléro (fixes #6486) Summary of changes: .../wao/services/service/csv/SamplingPlanImportExportModel.java | 7 ++++++- .../services/service/SclerochronologySamplingPlanServiceTest.java | 8 ++++++++ .../src/main/webapp/WEB-INF/content/administration/wao-users.jsp | 2 +- 3 files changed, 15 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 (dfaa79d -> 9480d83)
by codelutin.com scm 14 Jan '15

14 Jan '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 dfaa79d Correction d'une NPE potentielle new 109f65b Correction clé bundle new 0a84939 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres new 38ed029 Nom de variable new 1342d6f Passage de la synthèse scléro en trimestres new 16a9054 Filtres pour la synthèse scléro new 9480d83 Synthèses pour la sclérochronologie (fixes #2265) 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 9480d830a28b872a361fed3d118e4e7a15405232 Merge: dfaa79d 16a9054 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 18:13:06 2015 +0100 Synthèses pour la sclérochronologie (fixes #2265) commit 16a9054c7c8c8a5cfa76c7c13fa9fe8494e4e8a3 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 18:12:33 2015 +0100 Filtres pour la synthèse scléro commit 1342d6fa60c2fcfa621d1d3d4aeb401494b70129 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 18:08:26 2015 +0100 Passage de la synthèse scléro en trimestres commit 38ed0298eb7ca6f2d5c46f0b3e6973fe7172c29a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 15:51:17 2015 +0100 Nom de variable commit 0a84939e86d17c8c65019f1f7c5948f12efd203c Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 15:23:56 2015 +0100 Synthèses pour la scléro OK mais on est toujours en mois en non en trimestres commit 109f65b549b48497fd8ce2cfce599c840f898e54 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 12:05:30 2015 +0100 Correction clé bundle Summary of changes: .../src/main/java/fr/ifremer/wao/WaoUtils.java | 62 ++++- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 26 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 19 +- .../wao/services/service/ContactsService.java | 3 +- .../fr/ifremer/wao/services/service/Synthesis.java | 5 +- .../wao/services/service/SynthesisService.java | 66 +++-- .../resources/i18n/wao-services_en_GB.properties | 2 +- .../main/resources/i18n/wao-web_fr_FR.properties | 4 +- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 296 ++++++++++++--------- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 16 +- 10 files changed, 307 insertions(+), 192 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (920bef6 -> dfaa79d)
by codelutin.com scm 14 Jan '15

14 Jan '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 920bef6 On ignore un test qui pose problème new dfaa79d Correction d'une NPE potentielle 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 dfaa79d2563988a46f60e8c72ae61ef6a1ef1cf8 Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Wed Jan 14 10:01:11 2015 +0100 Correction d'une NPE potentielle Summary of changes: .../fr/ifremer/wao/services/service/BoatsFilterValues.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1