Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a019da5b by tchemit at 2019-07-14T13:54:37Z [jgitflow-maven-plugin]updating poms for 8.0-RC-4-SNAPSHOT development[skip ci] - - - - - e5835ad0 by tchemit at 2019-07-14T13:55:09Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-RC-3' with non-snapshot versions[skip ci] - - - - - 373ec662 by tchemit at 2019-07-14T14:02:34Z [jgitflow-maven-plugin]merging 'release/8.0-RC-3' into 'master' - - - - - 5fecf74a by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7669bc80 by tchemit at 2019-07-14T14:02:37Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 59ddc8b2 by tchemit at 2019-07-14T14:02:38Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 73b9506c by tchemit at 2019-07-14T14:22:39Z update pom - - - - - 5c66c3c0 by tchemit at 2019-07-14T14:22:49Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 055ea07d by tchemit at 2019-07-14T14:22:49Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 67a9d2d8 by tchemit at 2019-07-14T14:22:49Z Move to new version 9.0-alpha-1 - - - - - 57cedbbf by tchemit at 2019-07-14T14:22:50Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - bd332824 by tchemit at 2019-07-14T14:22:50Z Module 2 (first flush) - - - - - 2b469c02 by tchemit at 2019-07-14T14:22:51Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 28c26074 by tchemit at 2019-07-14T14:22:51Z Module 2 - second flush - - - - - f771007a by tchemit at 2019-07-14T14:40:29Z Report from v8 for ps logbook model - - - - - 60b96735 by tchemit at 2019-07-14T14:40:32Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 68f70e49 by tchemit at 2019-07-14T14:40:32Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToLeftAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/CopyFloatingObjectPartToRightAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/26ec02fbebb37bfeed06a4c5cbf... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/26ec02fbebb37bfeed06a4c5cbf... You're receiving this email because of your account on gitlab.com.