Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 5f0eea38 by 166231 at 2017-08-01T12:44:52+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-4-SNAPSHOT development[skip ci] - - - - - c815bd95 by 166231 at 2017-08-01T12:55:40+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 73f68b6b by 166231 at 2017-08-01T12:55:44+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop'[skip ci] - - - - - 20199cbc by 166231 at 2017-08-01T12:55:50+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 4c7f8fc7 by 166231 at 2017-08-01T13:06:06+00:00 Update changelog after stage of milestone 7.0-RC-3 [skip ci] - - - - - 85f8e145 by Tony CHEMIT at 2017-08-01T15:11:29+02:00 improve builds [skip ci] - - - - - 506c1564 by Tony CHEMIT at 2017-08-01T15:17:33+02:00 Update changelog after stage of milestone 7.0-RC-3 [skip ci] - - - - - 411070e6 by Tony CHEMIT at 2017-08-01T15:21:44+02:00 fix deploy demo build [skip ci] - - - - - ef2526ae by Tony CHEMIT at 2017-08-02T09:59:57+02:00 Problème de chargement de l'écran de référentiel FloatingObjectMaterial (See #807) + revue i18n - - - - - 6da3e14e by Tony CHEMIT at 2017-08-02T10:24:52+02:00 Optimisation traductions (See #808) - - - - - 7a1196d8 by Tony CHEMIT at 2017-08-02T11:05:14+02:00 Optimisation des traductions (un seul prefix pour toute la validation (économie de 400 traductions)) (See #808) - - - - - ef671e2f by Tony CHEMIT at 2017-08-02T13:33:52+02:00 Correction du nom d'un champs sur FloatingObject + ne pas pouvoir éditer l'opération de l'objet est mode modification (See #809) - - - - - f015dc52 by Tony CHEMIT at 2017-08-02T13:36:24+02:00 Ajout de la consolidation des dcp (See #810) - début d'implantation - - - - - b9557271 by Tony CHEMIT at 2017-08-02T14:00:37+02:00 Changement du nom des fichiers de configuration du client et serveur (See #811) - - - - - 65564f99 by Tony CHEMIT at 2017-08-02T14:07:37+02:00 add missing license headers - - - - - 67ed0d40 by 166231 at 2017-08-02T12:19:23+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-4' with non-snapshot versions[skip ci] - - - - - e9fde02d by 166231 at 2017-08-02T12:27:17+00:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-4' into 'master'[skip ci] - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/filtered-resources/observeSwing.conf → client-configuration/src/main/filtered-resources/observe-client.conf - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-validation/pom.xml - client-validation/src/main/java/fr/ird/observe/client/validators/CoordinateLatitudeDtoFieldValidator.java - client-validation/src/main/java/fr/ird/observe/client/validators/CoordinateLongitudeDtoFieldValidator.java - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BaitsCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BasketDto-ui-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-catchLongline-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-table-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/BranchlinesCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/CatchLonglineDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/EncounterDto-ui-update-warning-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/FloatlinesCompositionDto-ui-update-error-validation.xml - client-validation/src/main/resources/fr/ird/observe/services/dto/longline/GearUseFeaturesLonglineDto-ui-update-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/421978facc734a496e025300a2f... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/421978facc734a496e025300a2f... You're receiving this email because of your account on gitlab.com.