Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: b2ff2d12 by Tony CHEMIT at 2018-04-20T14:52:59Z [jgitflow-maven-plugin]updating poms for 7.0-RC-12-SNAPSHOT development[skip ci] - - - - - 6a951170 by Tony CHEMIT at 2018-04-20T15:07:35Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - de7865f6 by Tony CHEMIT at 2018-04-20T15:07:35Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1588af05 by Tony CHEMIT at 2018-04-20T15:07:36Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0977abfd by Tony CHEMIT at 2018-04-21T10:52:30Z update changelog after release 7.0-RC-11 [skip ci] - - - - - 82a198c5 by Tony CHEMIT at 2018-04-23T10:07:46Z Corriger certaines entrées de ObjectMaterial - See #928 - - - - - 1e0eaa67 by Tony CHEMIT at 2018-04-24T08:57:05Z Fix migration script - - - - - d9433970 by Tony CHEMIT at 2018-04-24T13:29:09Z Supprimer l'entrée non conforme du SpeciesGroupReleaseMode et toutes les associations indiuites sur les Speciesgroup - Closes #930 - - - - - 4540e328 by Tony CHEMIT at 2018-04-24T13:30:57Z * Ajout d'un référentiel PS NonTargetCatchReleaseConformity - Closes #929 * Remplacer detectionTime et release time par un référentiel NonTargetCatchReleasingTime - Closes #932 * Mettre à jour le référentiel NonTargetCatchReleaseStatus - Closes #933 * - - - - - c840b55e by Tony CHEMIT at 2018-04-24T13:57:27Z optimize dependencies - - - - - 63279977 by Tony CHEMIT at 2018-04-24T13:57:53Z Mettre les mêmes modes de libération que Whale shark pour le groupe d'espèce Cetaceans - Closes #931 - - - - - a0be7f0d by Tony CHEMIT at 2018-04-24T14:20:24Z Ajouter une nouvelle règle si un dcp présent alors le type de banc est obligatoirement Objet (changement de l'algorithme de consolidation) - Closes #938 - - - - - d2386af8 by Tony CHEMIT at 2018-04-25T18:31:34Z Revue des FAD material - See #935 - - - - - 5aa139a4 by Tony CHEMIT at 2018-04-25T19:03:58Z Corriger le problème de validation d'une chaine de caractère dans NonTargetCatchRelease Corriger le problème de validation d'une chaine de caractère dans NonTargetCatchRelease - Closes #934 - - - - - b3662aaf by Tony CHEMIT at 2018-05-02T12:53:49Z Calculer en temps réel les données calculées sur un FAD lors de la modification de ses materials (closes #937) - - - - - c0707507 by Tony CHEMIT at 2018-05-02T13:03:07Z Problème lors du changement de langue (les référentiels ne sont pas changé dans la bonne langue, mais ok après un redemarrage) (closes #936) - - - - - 2d09cd41 by Tony CHEMIT at 2018-05-03T09:37:37Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (See #941) - Update referential and migration - - - - - dc839eaa by Tony CHEMIT at 2018-05-03T13:43:13Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (See #941) - Add validation to check observed systems requirement on bycatch per species - See #941 - - - - - 1e9ef62e by Tony CHEMIT at 2018-05-03T14:06:42Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (Close #941) - Add FOB Observed system on activty as soon as a FOB is saved - - - - - c0741e19 by Tony CHEMIT at 2018-05-03T14:37:35Z use last version of config api - - - - - 0af25629 by Tony CHEMIT at 2018-05-04T08:15:42Z update pom + fix a plugin version - - - - - 7fc87781 by Tony CHEMIT at 2018-05-04T08:36:12Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with non-snapshot versions[skip ci] - - - - - 160c465c by Tony CHEMIT at 2018-05-04T08:43:33Z [jgitflow-maven-plugin]merging 'release/7.0-RC-12' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/filtered-resources/observe-client.conf - 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/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ChangeLanguageActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.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/NonTargetCatchReleaseConformityUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseConformityUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseConformityUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleasingTimeUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleasingTimeUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleasingTimeUIModel.java - client/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.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/ObserveTextGeneratorTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1e830c34a399b7827611d3dbe3e... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1e830c34a399b7827611d3dbe3e... You're receiving this email because of your account on gitlab.com.