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@codelutin.com> Date: Thu Feb 12 16:13:15 2015 +0100 Fusion #6641 dans develop commit d2a2f30b5f13687adec07d8eceaa3697faabff8a Author: Brendan Le Ny <bleny@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@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@codelutin.com>.