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 653a36dcc6bdf14ccd5a0f8f709e28ca41dbccb3 Merge: e1525fb 88d8920 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 6 16:59:31 2017 +0100 [jgitflow-maven-plugin]merging 'release/4.6.1' 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 +- .../catches/ValidateCruiseOperationsService.java | 7 +- .../GenericFormatExportOperationContext.java | 26 ++ .../importactions/ImportCatchAction.java | 3 + .../service/sampling/CruiseSamplingCache.java | 57 +-- .../IndividualObservationSamplingCacheRequest.java | 29 +- .../IndividualObservationSamplingStatus.java | 65 ++-- .../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/SpeciesFrequencyUIHandler.java | 7 +- .../referential/ManageTemporaryReferentialUI.jcss | 8 +- 30 files changed, 414 insertions(+), 494 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.