This is an automated email from the git hooks/post-receive script. New change to branch master-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 328a3be [jgitflow-maven-plugin]merging 'release/5.2' into 'master-5.x' adds ccf966c [jgitflow-maven-plugin]updating poms for 5.2.1-SNAPSHOT development adds b6dee55 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ef7fd54 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' adds f9aafd0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a673881 (cherry-pick) La suppression d'un équipement dans le référentiel ne fonctionne pas (Fixes #8937) adds a90824b (version 5) Lors de la suppression d'un programme, l'UI propose des programmes qui ne sont pas du type de la marée (Fixes #8935) adds b786836 Fix bad topia generation (Fixes #8934) adds 448144b Fix i18n adds a072348 [jgitflow-maven-plugin]updating poms for 5.2.2-SNAPSHOT development adds c0eb833 [jgitflow-maven-plugin]updating poms for 5.2.1 branch with snapshot versions adds b005794 [jgitflow-maven-plugin]updating poms for branch'release/5.2.1' with non-snapshot versions adds d798c3f Add missing license header adds add1438 [jgitflow-maven-plugin]merging 'release/5.2.1' into 'master-5.x' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- ...pplication-swing-configuration_en_GB.properties | 6 +- ...pplication-swing-configuration_es_ES.properties | 24 +- ...pplication-swing-configuration_fr_FR.properties | 10 +- application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 1250 +++++++++++++------- .../application-swing-decoration_en_GB.properties | 30 - .../application-swing-decoration_es_ES.properties | 42 +- .../application-swing-decoration_fr_FR.properties | 30 - application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 10 +- .../i18n/application-swing_en_GB.properties | 29 +- .../i18n/application-swing_es_ES.properties | 61 +- .../i18n/application-swing_fr_FR.properties | 29 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- .../entities/referentiel/SpeciesTopiaDao.java | 270 +++++ pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- .../services/dto/referential/ProgramHelper.java | 11 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 37 files changed, 1191 insertions(+), 659 deletions(-) create mode 100644 entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.