branch master updated (4041ec1 -> a295daf)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 4041ec1 [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' adds 37ba926 [jgitflow-maven-plugin]updating poms for 4.0.4-SNAPSHOT development adds a88f6b8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds edf8b01 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 9b591df [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds ffa1c92 Move to codelutinpom 3 adds 26b3b39 Ne pas conserve en cache le modèle de catégorisation (termine #7253) adds 873f1ab Corrige la perte des rôles enregistrés sur les traits dès qu'on modifie une campagne (refs #7283) adds b786680 [CAMPAGNE] si je modifie l'heure de fin de la campagne, je perds tous les saisisseurs des traits !!! (fixes #7283) Merge branch 'feature/7283' into develop adds b608f24 Voir toutes les espèces (species et benthos) qui ne respectent pas le protocole dans l'écran de validation (refs #7279) adds f99c48c [VALIDATION] la liste d’erreur n’affiche pas toutes les espèces ne respectant pas le proto mais seulement la 1ère (fixes #7279) Merge branch 'feature/7279' into develop adds 8f9e075 [jgitflow-maven-plugin]updating poms for branch'release/4.0.4' with non-snapshot versions adds a295daf [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 13 ++---------- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../service/CruisePersistenceServiceImpl.java | 24 ++++++++++++++++++++-- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../catches/ValidateCruiseOperationsService.java | 21 ++++++++++--------- .../service/catches/WeightComputingService.java | 8 ++------ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 10 files changed, 43 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm