Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c6160018 by Tony CHEMIT at 2017-05-28T12:26:06+02:00 transformation de ObjectOperation et suppression de ObjectFate - - - - - 3e3ee29e by Tony CHEMIT at 2017-05-29T04:37:28+02:00 Fix migrate dbs - - - - - 71d3978f by Tony CHEMIT at 2017-05-29T13:58:27+02:00 Add ObjectMaterial referential (See #577) - - - - - 69735fe4 by Tony CHEMIT at 2017-05-29T14:00:47+02:00 Merge branch 'feature/577' into develop-7.x - - - - - 30 changed files: - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-create-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-error-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-ui-update-warning-validation.xml → application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-warning-validation.xml - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jaxx - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectMaterialUIModel.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/resources/db/migration/6.901/01_add_object_operation2-H2.sql - + persistence/src/main/resources/db/migration/6.901/01_add_object_operation2-PG.sql - + persistence/src/main/resources/db/migration/6.901/02_fill_object_operation-H2.sql - + persistence/src/main/resources/db/migration/6.901/02_fill_object_operation-PG.sql - + persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-H2.sql - + persistence/src/main/resources/db/migration/6.901/03_patch_object_operation-PG.sql - + persistence/src/main/resources/db/migration/6.901/04_create_object_material-H2.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e92b11905087d1aa6d8ed3c4da5... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e92b11905087d1aa6d8ed3c4da5... You're receiving this email because of your account on gitlab.com.