Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: f2bd555c by Tony Chemit at 2023-04-02T11:04:46+02:00 [jgitflow-maven-plugin]updating poms for 9.1.0-RC-3-SNAPSHOT development[skip ci] - - - - - d20f1118 by Tony Chemit at 2023-04-02T11:35:52+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - ab1809e1 by Tony Chemit at 2023-04-02T11:35:53+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 709d641b by Tony Chemit at 2023-04-02T11:35:55+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 6fb73436 by Tony Chemit at 2023-04-04T09:30:25+02:00 Un marée sur laquelle l'assistant d'appariement bloque - Closes #2667 - - - - - a5a466fe by Tony Chemit at 2023-04-07T11:20:58+02:00 avdth - remove old tests - - - - - b2ac2fe8 by Tony Chemit at 2023-04-08T15:10:15+02:00 Remplir le champs Vessel.cfrId (utilisé pour akado) - Closes #2672 - - - - - 52c0b593 by Tony Chemit at 2023-04-13T09:51:48+02:00 update pom - - - - - 1ef6adbf by Tony Chemit at 2023-04-14T10:04:08+02:00 Etat par défaut du bouton radio Saisie groupée / Saisie individuelle sur capture LL - Closes #2671 - - - - - 8fb09b9c by Tony Chemit at 2023-04-14T10:04:08+02:00 Petites améliorations sur la gestion des numéros de sous-échantillons - Closes #2668 - - - - - 0dce310f by Tony Chemit at 2023-04-14T10:04:08+02:00 Dans les tableaux, remplacer les champs vides pour les nombres de valeur 0 par 0 - Closes #2674 - - - - - 3614488d by Tony Chemit at 2023-04-14T11:50:22+02:00 Ajouter une colonne poids total (en t) sur le tableau des cuves calées - Closes #2675 - - - - - a32d89c2 by Tony Chemit at 2023-04-14T18:07:45+02:00 Client UI - Reduce to 15 columns for sample activity species table - - - - - cec31ba6 by Tony Chemit at 2023-04-17T12:16:53+02:00 Revert "pom - fix distributionManagement for site (use now ssh over git)" This reverts commit 422b324194756bf1b71b6551994027db981ac09a. - - - - - feb3e621 by Tony Chemit at 2023-04-27T12:39:01+02:00 update pom - - - - - ff170c07 by Tony Chemit at 2023-04-27T12:42:46+02:00 Core - Ajout du champs SampleActivity.weightedWeightComputed - - - - - 044699bc by Tony Chemit at 2023-04-27T12:42:50+02:00 Consolidation - Add ps logbook SampleActivity consolidation - - - - - ac280ff0 by Tony Chemit at 2023-04-27T12:42:54+02:00 Client UI - Add ps logbook SampleActivity.computedWeightedWeight - - - - - 9af01566 by Tony Chemit at 2023-04-27T12:43:02+02:00 Merge branch 'feature/issue_2053' into develop Automatiser le calcul de la pondération de la calée dans la cuve échantillonnée - Closes #2053 - - - - - 5eac81d5 by Tony Chemit at 2023-04-27T12:56:32+02:00 Pom - move to version 9.1.0-SNAPSHOT and tidy poms - - - - - 5400c557 by Tony Chemit at 2023-04-27T13:21:06+02:00 Souci de migration v9 d'un commentaire - Closes #2677 - - - - - 1d19187e by Tony Chemit at 2023-04-27T13:21:41+02:00 Update changelog for v.9.1.0 [skip CI] - - - - - bc579df8 by Tony Chemit at 2023-04-27T13:40:08+02:00 [jgitflow-maven-plugin]updating poms for 9.1.0 branch with snapshot versions[skip ci] - - - - - 95c9a4b4 by Tony Chemit at 2023-04-27T13:40:51+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.1.0' with non-snapshot versions[skip ci] - - - - - 358d183c by Tony Chemit at 2023-04-27T14:19:22+02:00 [jgitflow-maven-plugin]merging 'release/9.1.0' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleActivityTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesMeasureTableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/WellActivityUITableModel.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleActivityResetComputedValue.java - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - core/api/dto-decoration/pom.xml - core/api/dto-decoration/src/main/i18n/getters/labels.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ef904dbaeca7258c298ee74f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ef904dbaeca7258c298ee74f... You're receiving this email because of your account on gitlab.com.