Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 31b08b24 by tchemit at 2020-04-01T11:49:30+02:00 [jgitflow-maven-plugin]updating poms for 7.5.1-SNAPSHOT development[skip ci] - - - - - a16952c8 by tchemit at 2020-04-01T11:57:45+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - ea1dddca by tchemit at 2020-04-01T11:57:46+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 59b76914 by tchemit at 2020-04-01T11:57:46+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 3d070135 by tchemit at 2020-04-04T16:24:52+02:00 Mise à jour simple de référentiel échoue en v7.5.0 - Closes #1461 - - - - - 5b631f82 by tchemit at 2020-04-06T15:01:48+02:00 Vérifier la présence ou ajouter un champ PS trip.homeid - Closes #1383 - - - - - ae6dc319 by tchemit at 2020-04-14T00:44:33+02:00 Accumulation de fichiers - Closes #1462 (report v7) - - - - - 2cd3fd54 by tchemit at 2020-04-14T00:54:37+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.5.1' with non-snapshot versions[skip ci] - - - - - 9d3129f4 by tchemit at 2020-04-14T01:03:32+02:00 [jgitflow-maven-plugin]merging 'release/7.5.1' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - client-runner/pom.xml - dto/pom.xml - dto/src/main/models/Observe.model - observe-i18n/pom.xml - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - observe/pom.xml - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/binder/data/longline/TdrEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java - − persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfiguration.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6f27425f4209743afbfcacaf6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6f27425f4209743afbfcacaf6... You're receiving this email because of your account on gitlab.com.