branch develop updated (6dc708a -> 6e00bd8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 6dc708a [jgitflow-maven-plugin]updating poms for 4.6.1-SNAPSHOT development new 83609f7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 347ae6f [jgitflow-maven-plugin]updating poms for 4.6.1-alpha branch with snapshot versions new c1f2f3c [jgitflow-maven-plugin]updating poms for branch'release/4.6.1-alpha' with non-snapshot versions new d5f7978 [jgitflow-maven-plugin]merging 'release/4.6.1-alpha' into 'master' new a3c56b0 [jgitflow-maven-plugin]merging 'master' into 'develop' new 6e00bd8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6e00bd8224730d220eecd91f08fa695f25a511b8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:12 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a3c56b0104dff7067007f54207f76d63cb805b48 Merge: 83609f7 d5f7978 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:11 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 83609f7f0e5b03a2e7a89189cd8084becdc035b8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:11 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d5f79782a904fa3e14d190d7e6701a335e4afb32 Merge: e1525fb c1f2f3c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:08 2017 +0100 [jgitflow-maven-plugin]merging 'release/4.6.1-alpha' into 'master' commit c1f2f3c647f4c15dce621cc6faf75c2a48238385 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:23:03 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.6.1-alpha' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit c1f2f3c647f4c15dce621cc6faf75c2a48238385 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:23:03 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.6.1-alpha' with non-snapshot versions --- pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8fb320b..03bea8b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 2cfaa77..5c7bf7c 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 62d1b17..3d98eae 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 25f50dc..297c11f 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index b6bd82b..4bf1502 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b1a28b0..9aff2f7 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 5a51176..243f88c 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index d69b4b2..e572c7f 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit d5f79782a904fa3e14d190d7e6701a335e4afb32 Merge: e1525fb c1f2f3c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:08 2017 +0100 [jgitflow-maven-plugin]merging 'release/4.6.1-alpha' into 'master' pom.xml | 4 +- .../AllegroCampagne-Specifications.odt | Bin 1206634 -> 1189485 bytes .../AllegroCampagne-Specifications.pdf | Bin 2146280 -> 2088026 bytes tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../GenericFormatExportOperationContext.java | 26 ++ .../importactions/ImportCatchAction.java | 3 + .../service/sampling/CruiseSamplingCache.java | 130 ++++--- .../IndividualObservationSamplingCacheRequest.java | 29 +- .../IndividualObservationSamplingContext.java | 3 +- .../IndividualObservationSamplingStatus.java | 30 +- .../FishingOperation-validate-error-validation.xml | 27 -- ...ishingOperation-validate-warning-validation.xml | 27 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/help/fr/config.html | 27 +- .../src/main/help/fr/editFishingOperation.html | 405 +++++---------------- tutti-ui-swing/src/main/help/fr/editProtocol.html | 36 +- .../src/main/help/fr/editSampleCategory.html | 4 +- tutti-ui-swing/src/main/help/fr/faq.html | 64 +--- tutti-ui-swing/src/main/help/fr/menu.html | 6 +- tutti-ui-swing/src/main/help/fr/navbar.js | 4 +- tutti-ui-swing/src/main/help/fr/validation.html | 4 +- .../create/CreateSpeciesBatchUIHandler.java | 5 +- .../frequency/IndividualObservationUICache.java | 79 +++- .../frequency/SamplingNotificationZoneHandler.java | 15 +- .../frequency/SpeciesFrequencyUIHandler.java | 7 +- .../referential/ManageTemporaryReferentialUI.jcss | 8 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 33 files changed, 443 insertions(+), 516 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 83609f7f0e5b03a2e7a89189cd8084becdc035b8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:11 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 547a2fd..03bea8b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index ed04ba4..5c7bf7c 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2fbbd05..3d98eae 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 07ed61f..297c11f 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 2ceec35..4bf1502 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 1c622f5..9aff2f7 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 709bdb3..243f88c 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 61956b9..e572c7f 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-SNAPSHOT</version> + <version>4.6.1-alpha</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a3c56b0104dff7067007f54207f76d63cb805b48 Merge: 83609f7 d5f7978 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:11 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6e00bd8224730d220eecd91f08fa695f25a511b8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 4 21:44:12 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 03bea8b..547a2fd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-caliper/pom.xml b/tutti-caliper/pom.xml index 5c7bf7c..ed04ba4 100644 --- a/tutti-caliper/pom.xml +++ b/tutti-caliper/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3d98eae..2fbbd05 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 297c11f..07ed61f 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 4bf1502..2ceec35 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 9aff2f7..1c622f5 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 243f88c..709bdb3 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e572c7f..61956b9 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.6.1-alpha</version> + <version>4.6.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm