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@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@codelutin.com> Date: Wed Jan 21 15:54:32 2015 +0100 mend commit 94e7bd8f1d593d96608d89d75110b013fa1249f5 Author: Brendan Le Ny <bleny@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@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@codelutin.com>.