Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

• f838f332
  by Tony CHEMIT at 2018-10-14T11:55:45Z

  Connexion HTTP probablement périmée - Closes #1141
  

• 22aa408e
  by Tony CHEMIT at 2018-10-14T11:55:47Z

  [PS][FOB] Plusieurs mappings anciens types FAD / Nouveaux matériaux sont erronés - Closes #1136
  

13 changed files:

• client/pom.xml
• client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java
• client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_1.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_2.java
• persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java
• − persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_4.java
• persistence/src/main/resources/db/migration/7.2/01_update_objectMaterial-common.sql → persistence/src/main/resources/db/migration/6.1/10_update_objectMaterial-common.sql
• persistence/src/main/resources/db/migration/7.4/01_update_object_operation-common.sql → persistence/src/main/resources/db/migration/6.1/11_update_object_operation-common.sql
• persistence/src/main/resources/db/migration/7.4/02_update_object_material-common.sql → persistence/src/main/resources/db/migration/6.1/12_update_object_material-common.sql
• − test/src/main/resources/db/7.4/dataForTestLongline.sql.gz
• − test/src/main/resources/db/7.4/dataForTestSeine.sql.gz
• − test/src/main/resources/db/7.4/empty_h2.sql.gz

The diff was not included because it is too large.