- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-10 branch with snapshot versions[skip ci]
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d053d2fc by Tony CHEMIT at 2018-04-09T18:53:33Z [jgitflow-maven-plugin]updating poms for 7.0-RC-10 branch with snapshot versions[skip ci] - - - - - 5f3d7b0c by Tony CHEMIT at 2018-04-09T18:54:34Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-10' with non-snapshot versions[skip ci] - - - - - 15dea28a by Tony CHEMIT at 2018-04-09T19:03:08Z [jgitflow-maven-plugin]merging 'release/7.0-RC-10' into 'master' - - - - - 1cf122b5 by Tony CHEMIT at 2018-04-09T19:03:11Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 4f921d71 by Tony CHEMIT at 2018-04-09T19:03:11Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 8412a82c by Tony CHEMIT at 2018-04-09T19:03:12Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fe2aab4ceae4fae483ee16e53… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fe2aab4ceae4fae483ee16e53… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-11-SNAPSHOT development[skip ci]
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1fe2aab4 by Tony CHEMIT at 2018-04-09T18:53:34Z [jgitflow-maven-plugin]updating poms for 7.0-RC-11-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>client</artifactId> @@ -883,7 +882,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> </target> </configuration> <goals> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-10-SNAPSHOT</version> + <version>7.0-RC-11-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1fe2aab4ceae4fae483ee16e53d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1fe2aab4ceae4fae483ee16e53d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-10
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed new branch release/7.0-RC-10 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-10 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last toolkit version
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0b2844dd by Tony CHEMIT at 2018-04-09T18:30:24Z use last toolkit version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.0-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>3.0</observeToolkitVersion> <lib.version.java4all.jaxx>3.0-alpha-26</lib.version.java4all.jaxx> <lib.version.nuiton.topia>3.3.1</lib.version.nuiton.topia> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0b2844ddbad0738e3a8bf1c9f0d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0b2844ddbad0738e3a8bf1c9f0d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix dependency for web motion
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8dc35135 by Tony CHEMIT at 2018-04-09T18:13:39Z fix dependency for web motion - - - - - 1 changed file: - server/pom.xml Changes: ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -129,6 +129,12 @@ <artifactId>webmotion</artifactId> </dependency> <dependency> + <groupId>com.rometools</groupId> + <artifactId>rome</artifactId> + <version>1.5.0</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion-unittest</artifactId> <exclusions> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8dc351359ab7a2954dfca9d7262… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8dc351359ab7a2954dfca9d7262… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [PS] Libellés des formulaires sous Calée à mettre à jour (Closes #881)
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f17670f3 by Tony CHEMIT at 2018-04-09T17:24:34Z [PS] Libellés des formulaires sous Calée à mettre à jour (Closes #881) - - - - - 59828b34 by Tony CHEMIT at 2018-04-09T17:24:36Z [PS] Tableaux de captures et échantillons (Closes #883) - - - - - 8866f09e by Tony CHEMIT at 2018-04-09T17:24:36Z [PS] Sasie d'un échantillon - présélection du type de mesure par défaut (Closes #884) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseTableModel.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/NonTargetCatchUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.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 - dto/src/main/models/Observe.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0443ba9155d11d23b300dd497b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0443ba9155d11d23b300dd497b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Sasie d'un échantillon - présélection du type de mesure par défaut (Closes #884)
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0443ba91 by Tony CHEMIT at 2018-04-09T17:07:45Z [PS] Sasie d'un échantillon - présélection du type de mesure par défaut (Closes #884) - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java @@ -106,8 +106,9 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS // on utilise le code par defaut de l'espèce Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); + log.debug("Default size measure "+sizeMeasureType.orElse(null)); getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); - + resetDefaultSizeMeasureType(); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java @@ -111,9 +111,9 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar // on utilise le code par defaut de l'espèce Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - + log.debug("Default size measure "+sizeMeasureType.orElse(null)); ((TargetSampleUI) getUi()).getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); - + resetDefaultSizeMeasureType(); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0443ba9155d11d23b300dd497b9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0443ba9155d11d23b300dd497b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Tableaux de captures et échantillons (Closes #883)
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9c16e540 by Tony CHEMIT at 2018-04-09T16:56:20Z [PS] Tableaux de captures et échantillons (Closes #883) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseTableModel.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/NonTargetCatchUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.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 - dto/src/main/models/Observe.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9c16e540eb48aacc17dd79b871b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9c16e540eb48aacc17dd79b871b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Libellés des formulaires sous Calée à mettre à jour (Closes #881)
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c8496284 by Tony CHEMIT at 2018-04-09T14:01:06Z [PS] Libellés des formulaires sous Calée à mettre à jour (Closes #881) - - - - - 1 changed file: - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1518,18 +1518,18 @@ observe.ui.tree.longline.sensorUsed=Capteurs utilisés observe.ui.tree.longline.setDetailComposition=Compositions détaillées observe.ui.tree.longline.setGlobalComposition=Compositions globales observe.ui.tree.longline.tdr=Enregistreurs de profondeur -observe.ui.tree.seine.discardedTargetCatch=Rejet de thon -observe.ui.tree.seine.discardedTargetSample=Echantillon thon rejeté -observe.ui.tree.seine.keptTargetCatch=Capture cible -observe.ui.tree.seine.keptTargetSample=Echantillon thon capturé -observe.ui.tree.seine.nonTargetCatch=Faunes accessoire conservée ou rejetée -observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées -observe.ui.tree.seine.nonTargetSample=Echantillons faune accessoire +observe.ui.tree.seine.discardedTargetCatch=Thons rejetés +observe.ui.tree.seine.discardedTargetSample=Échantillons thons rejetés +observe.ui.tree.seine.keptTargetCatch=Thons conservés +observe.ui.tree.seine.keptTargetSample=Échantillons thons conservés +observe.ui.tree.seine.nonTargetCatch=Espèces accessoires conservées ou rejetées +observe.ui.tree.seine.nonTargetCatchRelease=Espèces accessoires libérées +observe.ui.tree.seine.nonTargetSample=Échantillons espèces accessoires observe.ui.tree.seine.objectObservedSpecies=Faune observée observe.ui.tree.seine.objectOperation=Opérations sur l'objet observe.ui.tree.seine.objectSchoolEstimate=Estimations banc objet observe.ui.tree.seine.routes=Routes -observe.ui.tree.seine.schoolEstimate=Estimations banc +observe.ui.tree.seine.schoolEstimate=Estimation banc observe.usage.action.shouldReplace=Remplacer le référentiel désactivé ? observe.usage.replaceTitle=Objet de remplacement observe.usage.usageTitle=Références trouvées View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c84962840c463ca2b4c235cc710… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c84962840c463ca2b4c235cc710… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Code clean - optimize toArray method
by Tony CHEMIT 09 Apr '18

09 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d6500800 by Tony CHEMIT at 2018-04-08T09:56:41Z Code clean - optimize toArray method - - - - - d57e2d96 by Tony CHEMIT at 2018-04-08T17:08:38Z clean code + use last pom - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/log4j.properties - client-configuration/src/main/resources/observe-log4j.properties - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/obstuna-admin/extra/01_create-postgis-1-activity.sql - client/src/main/assembly/dist/obstuna-admin/extra/02_create-postgis-2-harbour.sql - client/src/main/assembly/dist/obstuna-admin/extra/03_create-postgis-3-activity-seine.sql - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql - client/src/main/assembly/dist/obstuna-admin/extra/05_function_enhanced_sets_school_types.sql - client/src/main/assembly/i18n.xml - client/src/main/assembly/map.xml - client/src/main/assembly/sql/v1/sql/obstuna.sql - client/src/main/filtered-resources/observe-application.properties - client/src/main/java/fr/ird/observe/client/FloatingObjectPresetsManager.java - client/src/main/java/fr/ird/observe/client/ObserveActionExecutor.java - client/src/main/java/fr/ird/observe/client/ObserveCLAction.java - client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java - client/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java - client/src/main/java/fr/ird/observe/client/ObserveSwingTechnicalException.java - client/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java - client/src/main/java/fr/ird/observe/client/RunObserve.java - client/src/main/java/fr/ird/observe/client/backup/AtCloseApplicationLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/AutomaticLocalDatabaseBackupTask.java - client/src/main/java/fr/ird/observe/client/backup/BackupStorage.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/16a4627037064e9c1ccf18263c… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/16a4627037064e9c1ccf18263c… You're receiving this email because of your account on gitlab.com.

1 0