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

Commits:

• 1fe2aab4
  by Tony CHEMIT at 2018-04-09T18:53:34Z

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

• 1cf122b5
  by Tony CHEMIT at 2018-04-09T19:03:11Z

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

• 4f921d71
  by Tony CHEMIT at 2018-04-09T19:03:11Z

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

• 8412a82c
  by Tony CHEMIT at 2018-04-09T19:03:12Z

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

• 7888cd6b
  by Tony CHEMIT at 2018-04-09T19:38:07Z

  Update changelog after release 7.0-RC-10 [skip ci]
  

• b4bd22ae
  by Tony CHEMIT at 2018-04-20T14:51:13Z

  Améliorations sur le formulaire relâche d'espèce sensible (closes #926)
  

• baa329c3
  by Tony CHEMIT at 2018-04-20T14:51:15Z

  fix docker generation
  

• 225af08d
  by Tony CHEMIT at 2018-04-20T14:51:15Z

  update dependencies
  

• 6076350b
  by Tony CHEMIT at 2018-04-20T14:53:41Z

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

• 0f99775d
  by Tony CHEMIT at 2018-04-20T14:57:18Z

  fix dependencies
  

• 1e830c34
  by Tony CHEMIT at 2018-04-20T15:07:29Z

  [jgitflow-maven-plugin]merging 'release/7.0-RC-11' into 'master'

30 changed files:

• .gitlab-ci.yml
• CHANGELOG.md
• client-configuration/pom.xml
• client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
• client-configuration/src/main/resources/log4j.properties
• client-configuration/src/main/resources/observe-log4j.properties
• client/pom.xml
• client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss
• client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java
• client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
• client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
• client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx
• client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss
• client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
• client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIModel.java
• + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseStatusUI.jaxx
• client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseStatusesUI.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseStatusUIHandler.java
• + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseStatusUIModel.java
• client/src/main/resources/i18n/client_en_GB.properties
• client/src/main/resources/i18n/client_es_ES.properties
• client/src/main/resources/i18n/client_fr_FR.properties
• client/src/test/java/fr/ird/observe/client/ui/content/simple/longline/LonglineDetailCompositionValidatorServiceTest.java
• dto/pom.xml
• + dto/src/main/java/fr/ird/observe/binder/referential/seine/NonTargetCatchReleaseStatusDtoReferenceBinder.java
• + dto/src/main/java/fr/ird/observe/dto/data/seine/NonTargetCatchReleaseDto.java
• dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
• dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
• dto/src/main/models/Observe.model
• dto/src/main/resources/i18n/dto_en_GB.properties
• dto/src/main/resources/i18n/dto_es_ES.properties

The diff was not included because it is too large.