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

Commits:

• 25e30088
  by Tony CHEMIT at 2018-10-21T15:13:56Z

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

• 6744d82e
  by Tony CHEMIT at 2018-10-21T15:38:08Z

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

• fb6c76b0
  by Tony CHEMIT at 2018-10-21T15:38:09Z

  [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'

• 0039df80
  by Tony CHEMIT at 2018-10-21T15:38:10Z

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

• b5776a91
  by Tony CHEMIT at 2018-11-11T15:09:58Z

  use new I18n API
  

• 7550a9ab
  by Tony CHEMIT at 2018-11-11T15:27:27Z

  update licenses + use last toolkit
  

• 304dfcbd
  by Tony CHEMIT at 2018-11-11T17:12:26Z

  Petite défaut dans le référentiel objectmaterial (legacy codes) - Closes #1167
  

• 4a05bf12
  by Tony CHEMIT at 2018-11-11T17:44:23Z

  Infobulles sur l'assistant changement de source - Closes #1164
  

• 97f8b57a
  by Tony CHEMIT at 2018-11-11T17:59:43Z

  Traductions espagnoles - Closes #1165
  

• dc467704
  by Tony CHEMIT at 2018-11-11T19:09:29Z

  [FOB] Les valeurs des caractéristiques/matériaux désactivés ne sont pas affichées - Closes #1168
  

• c9fd8358
  by Tony CHEMIT at 2018-11-11T20:18:25Z

  Prepare release 7.0.0
  

• 3876d01b
  by Tony CHEMIT at 2018-11-11T20:54:15Z

  Fix log levels
  

• dcb0cfb7
  by tchemit at 2018-11-11T23:29:00Z

  remove config plugin from report, it does not works very well
  

• d8ecd548
  by tchemit at 2018-11-12T20:16:52Z

  Le script postgresql/update.bat ne démarre pas - Closes #1163
  

• 55e382ad
  by tchemit at 2018-11-14T00:07:18Z

  Traductions espagnoles - update i18n editor (See #1165)
  

• 76b00ba0
  by tchemit at 2018-11-14T00:13:45Z

  Traductions espagnoles - add first IEO es translations :) editor (See #1165)
  

• 2c21fc3e
  by tchemit at 2018-11-14T10:17:13Z

  [FOB] Affichage bizarre - Closes #1169
  

• a8d6f5a2
  by tchemit at 2018-11-14T11:57:06Z

  Mise à jour des objectmaterial - Closes #1170
  

• 8f3cb485
  by tchemit at 2018-11-14T11:57:35Z

  Mise à jour des objectmaterial - Closes #1170 (update tests)
  

• 32ce9aff
  by tchemit at 2018-11-14T13:28:31Z

  Après insertion de #1170 - Closes #1171
  

• a591a8b2
  by tchemit at 2018-11-14T16:03:19Z

  Traductions espagnoles - IEO work of the day \o/
  

• f20f5468
  by tchemit at 2018-11-16T12:32:13Z

  Traductions espagnoles - IEO work of the day \o/
  

• 840fa8fc
  by tchemit at 2018-11-16T15:27:24Z

  Traductions espagnoles - IEO work of the day \o/
  

• 97781ea7
  by tchemit at 2018-11-16T15:36:03Z

  Traductions espagnoles - Closes #1165
  

• f249e6ae
  by tchemit at 2018-11-18T19:54:21Z

  update some libs
  

• 5b166504
  by tchemit at 2018-11-19T17:40:17Z

  Spanish translations - See #1173
  

• 9904a4b2
  by tchemit at 2018-11-21T10:58:12Z

  Spanish translations - Closes #1173
  

• 124041ee
  by tchemit at 2018-11-21T12:07:10Z

  [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175
  

• 42ebd1c5
  by tchemit at 2018-11-21T12:24:38Z

  [PS][FOB] Permettre NULL sur les propriétés biodegradable et nonentangling, ainsi que sur les déductions - Closes #1175 (test)
  

• 50ab4210
  by tchemit at 2018-11-21T12:24:45Z

  Propriétés biodegradable et nonEntangling non présentes sur l'éditeur de ObjectMaterial - Closes #1176
  

• 6598bbc9
  by Pascal Cauquil at 2018-11-21T17:23:15Z

  Matériau objet 2-2-4-2 'Net', passage de biodegradable de NULL à FALSE (c'était un oubli)

• ba747f4c
  by tchemit at 2018-11-23T12:32:45Z

  Question calculs biodégradable, nonentangling et type simplifié à l'arrivée et au départ - Closes #1177
  

• e73b7d6d
  by tchemit at 2018-11-23T12:32:45Z

  [PS] Libération faune accessoire -> Exception - Closes #1174
  

• e42f8ae6
  by tchemit at 2018-11-26T12:20:21Z

  update license header
  

• e03f69c4
  by tchemit at 2018-11-26T12:23:18Z

  [jgitflow-maven-plugin]updating poms for 7.0.0 branch with snapshot versions[skip ci]

• 2edf7984
  by tchemit at 2018-11-26T12:24:45Z

  let's deploy to central this release
  

• 241e1196
  by tchemit at 2018-11-26T12:26:39Z

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

• 6c131cfd
  by tchemit at 2018-11-26T12:38:55Z

  [jgitflow-maven-plugin]merging 'release/7.0.0' into 'master-7.x'

30 changed files:

• client-configuration/.mvn/i18n-generate → client-configuration/.mvn/i18n/parse-java-enumerations
• client-configuration/pom.xml
• + client-configuration/src/main/i18n/getters/config.getter
• + client-configuration/src/main/i18n/getters/java-enumeration.getter
• client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
• client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.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-configuration/src/main/resources/log4j2.xml
• client-configuration/src/main/resources/observe-log4j2.xml
• client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java
• client/.mvn/add-build-number → client-core/.mvn/add-build-number
• client/.mvn/add-geotools-repository → client-core/.mvn/add-geotools-repository
• client-configuration/.mvn/i18n-parse-java → client-core/.mvn/i18n/parse-java
• client-configuration/.mvn/i18n-parse-java-enumerations → client-core/.mvn/i18n/parse-java-enumerations
• client/.mvn/jaxx-generate → client-core/.mvn/jaxx-generate
• client/.mvn/pom.gitflow.develop → client-core/.mvn/pom.gitflow.develop
• client/.mvn/pom.gitflow.master → client-core/.mvn/pom.gitflow.master
• client/.mvn/pom.organizationId → client-core/.mvn/pom.organizationId
• client/.mvn/pom.projectId → client-core/.mvn/pom.projectId
• client/.mvn/pom.stageId → client-core/.mvn/pom.stageId
• client/LICENSE.txt → client-core/LICENSE.txt
• client/README.md → client-core/README.md
• + client-core/pom.xml
• client/src/license/THIRD-PARTY.properties → client-core/src/license/THIRD-PARTY.properties
• + client-core/src/main/assembly/map.xml
• + client-core/src/main/filtered-resources/observe-application.properties
• + client-core/src/main/i18n/getters/java-enumeration.getter
• + client-core/src/main/i18n/getters/java.getter

The diff was not included because it is too large.