Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 51631b0b by Tony CHEMIT at 2018-05-20T12:23:02Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-2-SNAPSHOT development[skip ci] - - - - - 6841047c by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 6a408a9f by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - aba95f60 by Tony CHEMIT at 2018-05-20T12:33:51Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 412af2fd by Tony CHEMIT at 2018-05-20T12:38:59Z let build on develop branches [skip ci] - - - - - 4cc816ba by Tony CHEMIT at 2018-05-20T12:41:53Z update changelog after release 8.0-alpha-1 [skip ci] - - - - - 84faf638 by Tony CHEMIT at 2018-05-22T19:11:57Z Renommage des « données observateurs » du modèle Palangre - Closes #903 - - - - - 09e4c050 by Tony CHEMIT at 2018-05-22T22:43:05Z Ajout du référentiel observe_longline.TripType - Closes #951 - - - - - cbb0aab3 by Tony CHEMIT at 2018-05-22T22:43:09Z Réusinage de la donnée observe_longline.Trip - Closes #904 - - - - - 18c3e9ae by Tony CHEMIT at 2018-05-22T22:43:09Z use topia extension - - - - - f229b8ea by Tony CHEMIT at 2018-05-23T13:08:08Z Tableaux de synthèse - Closes #916 - - - - - 35611d4c by Tony CHEMIT at 2018-05-23T13:08:10Z Correction des variables dans les rapports - - - - - ad043ab9 by Tony CHEMIT at 2018-05-24T08:04:33Z Gestion des méthodes de mesure sur les formulaires existants - Closes #917 - - - - - c546e43b by Tony CHEMIT at 2018-05-24T08:35:00Z Update toolkit and topia-extension - - - - - 302bcb13 by Tony CHEMIT at 2018-05-24T08:37:48Z update gitlab cache and changelog of release 8.0-alpha-2 - - - - - 3b3c0ef9 by Tony CHEMIT at 2018-05-24T08:51:04Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-2' with non-snapshot versions[skip ci] - - - - - d7d154bf by Tony CHEMIT at 2018-05-24T09:01:37Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-2' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/gitlab-cache/milestones/528849-artifacts.json - + .mvn/gitlab-cache/milestones/528849-issues.json - + .mvn/gitlab-cache/milestones/528849.json - + .mvn/gitlab-cache/milestones/529485-artifacts.json - + .mvn/gitlab-cache/milestones/529485-issues.json - + .mvn/gitlab-cache/milestones/529485.json - + .mvn/gitlab-cache/milestones/532584-issues.json - + .mvn/gitlab-cache/milestones/532584.json - − .mvn/jvm.config - − .mvn/maven.config - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - 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/pom.xml - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ea68646376919e431e8b9e5ca07... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ea68646376919e431e8b9e5ca07... You're receiving this email because of your account on gitlab.com.