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 ff93260c054fe3d12bd3c0a97757fbaa05af745b Merge: 8d78952 380f973 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:22 2015 +0000 Merge branch 'release/5.0-RC3' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 28 +++++++++++++++ .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 3 +- .../wao/entity/IndividualMeasurementStrategy.java | 5 +++ .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 11 ++++++ .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 38 +++++++++++++++++++++ ...ies,_add_laboratories,_add_sclerochronology.sql | 4 +++ .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 1 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62432 bytes wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 9 ++++- .../wao/services/service/ContactsService.java | 12 ++----- .../services/service/SampleRowsFilterValues.java | 23 ++++++++++--- .../wao/services/service/SamplingPlanService.java | 10 ++---- .../service/SclerochronologySamplingPlan.java | 7 ++++ .../wao/services/service/SynthesisService.java | 9 ++++- .../service/administration/CompaniesService.java | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../SclerochronologySamplingPlanServiceTest.java | 4 +-- .../ifremer/wao/services/service/WaoFixtures.java | 9 ++--- wao-web/pom.xml | 2 +- .../action/administration/EditWaoUserAction.java | 4 ++- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 3 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 7 ++++ .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 17 ++++++--- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 7 ++++ wao-web/src/main/webapp/wao.css | 5 +++ 32 files changed, 191 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.