Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 816abce3 by tchemit at 2020-03-26T11:13:57+01:00 [jgitflow-maven-plugin]updating poms for 7.4.1-SNAPSHOT development[skip ci] - - - - - 93c5e573 by tchemit at 2020-03-26T11:26:55+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 06acaba1 by tchemit at 2020-03-26T11:26:55+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 3ce0b147 by tchemit at 2020-03-26T11:26:56+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 952c8da4 by tchemit at 2020-03-27T17:32:14+01:00 Mauvais affichage d'une marée dans l'arbre de navigation - Closes #1457 - - - - - eb802bb7 by tchemit at 2020-03-27T17:32:28+01:00 move to version 7.5.0 - - - - - 03cdafe9 by tchemit at 2020-03-31T11:25:10+02:00 Réusinage de la table transmittingbuoy - Closes #1456 - - - - - f607b4da by tchemit at 2020-03-31T11:25:12+02:00 Correction de la migration 7.4.0 - Closes #1458 - - - - - 0c3fe14e by tchemit at 2020-03-31T11:25:12+02:00 Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459 - - - - - 1b7c34eb by tchemit at 2020-03-31T11:25:12+02:00 Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - Closes #1100 - - - - - 0a0d2335 by tchemit at 2020-03-31T14:03:45+02:00 [REFERENTIEL BALISES] Ajout d'un champ 'technology' - Closes #1460 - - - - - 24c70bef by tchemit at 2020-04-01T11:14:00+02:00 Erreur sur changement de caractéristique d'équipement de type de donnée différent - Closes #1437 - - - - - df6fad63 by tchemit at 2020-04-01T11:51:20+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.5.0' with non-snapshot versions[skip ci] - - - - - 6f27425f by tchemit at 2020-04-01T11:57:42+02:00 [jgitflow-maven-plugin]merging 'release/7.5.0' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - 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/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - − client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx - − client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jcss - − client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/TransmittingBuoyTypeUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellEditor.java - client-core/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java - − client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/FloatingObjectTransmittingBuoyNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/validation/ObserveSwingValidator.java - client-runner/pom.xml - dto/pom.xml - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/binder/data/seine/TransmittingBuoyDtoReferenceBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adabdcceef0af7b10874b0751... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adabdcceef0af7b10874b0751... You're receiving this email because of your account on gitlab.com.