This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit dfad2351a30af4b4aef2a0add3365bacf4e96c79 Merge: f01d75b 141f8e2 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 23 10:50:07 2014 +0100 Corrections pour éviter la notion d'organisation (fixes #6295) .../main/java/fr/ifremer/wao/entity/Companies.java | 2 +- .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 4 +- .../java/fr/ifremer/wao/entity/Organisations.java | 10 ++--- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 ++++++++ .../administration/OrganisationsService.java | 9 ++--- .../service/administration/WaoUsersList.java | 44 ++++++++++++++++++++++ .../service/administration/WaoUsersService.java | 19 +++++----- .../operations/OrganisationParserFormatter.java | 2 +- .../web/action/administration/WaoUsersAction.java | 13 +++---- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 7 ++-- .../WEB-INF/content/administration/wao-users.jsp | 24 ++++++++++-- .../WEB-INF/content/edit-sample-row-input.jsp | 7 +++- 13 files changed, 119 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.