Tony CHEMIT pushed to branch master at ultreiaio / ird-observe

Commits:

• 39c7c529
  by 166231 at 2017-08-02T12:19:07+00:00

  [jgitflow-maven-plugin]updating poms for 7.0-RC-5-SNAPSHOT development[skip ci]

• 22cf0be6
  by 166231 at 2017-08-02T12:27:25+00:00

  [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]

• 14a30298
  by 166231 at 2017-08-02T12:27:26+00:00

  [jgitflow-maven-plugin]merging 'master' into 'develop'[skip ci]

• 3839bdc3
  by 166231 at 2017-08-02T12:27:28+00:00

  [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]

• 2b36e4bb
  by Tony CHEMIT at 2017-08-02T14:47:28+02:00

  Update changelog after stage of milestone 7.0-RC-4 [skip ci]
  

• 69cd0c35
  by Tony CHEMIT at 2017-08-02T17:17:46+02:00

  Migration sur les dcp du ObjectType en ObjectMaterialParts (See #814)
  

• 72605589
  by Tony CHEMIT at 2017-08-02T20:42:15+02:00

  Ajout de la consolidation des dcp (calcul du SimplifiedObjectType) (See #810)
  

• 0c43c46b
  by Tony CHEMIT at 2017-08-02T21:28:50+02:00

  L'écran Senne Activité indique qu'il n'y a pas de dcp alors que j'en ai saisi un (See #812)
  

• 4c44fbe5
  by Tony CHEMIT at 2017-08-02T21:40:15+02:00

  correction du nom du set à récuperer
  

• 1663a048
  by Tony CHEMIT at 2017-08-03T00:20:50+02:00

  improve user configuration actions
  

• a2029feb
  by Tony CHEMIT at 2017-08-03T00:21:26+02:00

  Ajout de la consolidation des dcp (See #810) - fix some bugs to make this works...
  

• dcbd4b87
  by 166231 at 2017-08-02T22:46:07+00:00

  [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-5' with non-snapshot versions[skip ci]

• e3cf678e
  by 166231 at 2017-08-02T22:56:30+00:00

  [jgitflow-maven-plugin]merging 'release/7.0-RC-5' into 'master'[skip ci]

30 changed files:

• CHANGELOG.md
• client-configuration/pom.xml
• client-validation/pom.xml
• − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-error-validation.xml
• − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-create-warning-validation.xml
• − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-error-validation.xml
• − client-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-ui-update-warning-validation.xml
• client-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml
• client-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-create-error-validation.xml
• client-validation/src/main/resources/fr/ird/observe/services/dto/seine/FloatingObjectDto-ui-update-error-validation.xml
• client-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java → client-validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java
• client/pom.xml
• client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java
• client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jaxx
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUI.jcss
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIHandler.java
• client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java
• client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectMaterialUIHandler.java
• − client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
• common/pom.xml
• observe/pom.xml
• persistence/pom.xml
• client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectTypeUIModel.java → persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/ObjectMaterialImpl.java
• client/src/main/java/fr/ird/observe/client/ui/content/ref/impl/seine/ObjectTypeUIHandler.java → persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/ObjectMaterialTopiaDao.java
• + persistence/src/main/java/fr/ird/observe/entities/referentiel/seine/SimplifiedObjectTypeNode.java
• persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java
• 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/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_4.java

The diff was not included because it is too large.