Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 075bfed9 by tchemit at 2018-11-26T12:23:20Z [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci] - - - - - fdd54082 by tchemit at 2018-11-26T12:39:00Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 33652305 by tchemit at 2018-11-26T12:39:01Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 285a3f13 by tchemit at 2018-11-26T12:39:02Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - f664945e by tchemit at 2018-12-21T03:25:02Z Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188 - - - - - 91712433 by tchemit at 2018-12-21T04:03:32Z Conformité des topiaid de floatingobjectpart - See #1191 - - - - - 5492b59e by tchemit at 2018-12-31T20:52:40Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - defa2ca0 by tchemit at 2018-12-31T21:22:19Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 3655d085 by tchemit at 2019-01-02T14:37:30Z [PS] Marées non visibles dans l'arbre après insertion - Closes #1187 - - - - - f321a966 by tchemit at 2019-01-02T14:51:32Z Happy new year commit - - - - - d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 71c951c6 by tchemit at 2019-01-02T14:57:31Z [jgitflow-maven-plugin]merging 'release/7.0.1' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/filtered-resources/observe-application.properties - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6c131cfd278c1194001c25a8fb3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6c131cfd278c1194001c25a8fb3... You're receiving this email because of your account on gitlab.com.