Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 4aecbee1 by tchemit at 2019-02-18T10:02:12Z [jgitflow-maven-plugin]updating poms for 7.0.5-SNAPSHOT development[skip ci] - - - - - 0690ec80 by tchemit at 2019-02-18T10:09:04Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 2d250881 by tchemit at 2019-02-18T10:09:05Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - bbe2d82b by tchemit at 2019-02-18T10:09:05Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 35aae06f by tchemit at 2019-02-19T11:19:47Z [PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués - Closes #1234 - - - - - 46c0980f by tchemit at 2019-02-19T15:25:59Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - f8d6ef63 by tchemit at 2019-02-19T16:31:43Z Equipement bateau, bug sur suppression de caractéristique - Closes #1232 - - - - - 803fa23f by tchemit at 2019-02-20T09:57:10Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - 262eb4c7 by tchemit at 2019-02-20T12:31:47Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.5' with non-snapshot versions[skip ci] - - - - - aee3a6b9 by tchemit at 2019-02-20T12:39:43Z [jgitflow-maven-plugin]merging 'release/7.0.5' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/FloatlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/HooksCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTableModel.java - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f2b67ccc3c64e7c5955f8b032eb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f2b67ccc3c64e7c5955f8b032eb... You're receiving this email because of your account on gitlab.com.