This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 620eb0197314c985956c01de0a10061738269651 Merge: d5db9ba e543f39 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 15 18:00:54 2015 +0200 Merge branch 'feature/7601' into develop .../fr/ird/observe/ObserveOpenDataManager.java | 5 ++ .../ui/content/table/ContentTableUIHandler.java | 2 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 14 ++-- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 38 ++++------ .../impl/seine/ObjectSchoolEstimateUIModel.java | 40 +++++++--- ...choolEstimateDto-n1-update-error-validation.xml | 51 +++++++++++++ ...choolEstimateDto-n1-update-error-validation.xml | 55 ++++++++++++++ ...oolEstimateDto-n1-update-warning-validation.xml | 40 ++++++++++ .../ObjectSchoolEstimateServiceController.java | 4 +- .../ird/observe/entities/referentiel/Species2.java | 18 +++++ .../observe/entities/referentiel/SpeciesLists.java | 11 +++ .../service/seine/ObjectSchoolEstimateService.java | 2 +- .../ird/observe/services/ObserveServiceTopia.java | 22 ++++-- .../ird/observe/services/entity/EntitiesSet.java | 36 +++++++++ .../services/entity/ObserveEntitiesFilters.java | 87 ++++++++++++++-------- .../services/entity/ObserveEntityFilter.java | 11 ++- .../services/entity/SpeciesListEntitiesSet.java | 27 +++++++ .../services/entity/UniverseEntitiesSet.java | 30 ++++++++ .../seine/ObjectSchoolEstimateServiceTopia.java | 4 +- 19 files changed, 405 insertions(+), 92 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.