branch master updated (59f1552 -> f75ea1d)
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 59f1552 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master' adds 9913c89 [jgitflow-maven-plugin]updating poms for 4.0.7-SNAPSHOT development adds bdf2ecd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 42d0120 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 6cc03ae [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a2be354 Ne proposer que les espèces (benthos) définis dans le protocole lors de la création d'un nouveau lot (See #7490) adds 87462ee Ne proposer que la liste des espèces (benthos) définies dans le protocole lors de la création d'un nouveau lot. Si le protocole n'est pas défini, alors on continue à utiliser la liste exhaustive des espèces référentes. termine #7490 Merge branch 'feature/7490' into develop adds 83fd891 Ajout du thread dans les logs adds dcedd6f Changement du niveau de log sur le chargement d'un bean dans ButtonAttachment adds bebc45c Suppression d'un log sauvage adds 8c8330c Capture et non traitement des errreurs venant du thread swing (See #7489) adds 2ea1d82 suppression du variable de version qui ne sert plus adds a0444bc [jgitflow-maven-plugin]updating poms for branch'release/4.0.7' with non-snapshot versions adds f75ea1d [jgitflow-maven-plugin]merging 'release/4.0.7' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 5 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 61 ++++++++++++++++++++-- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/log4j.properties | 4 +- .../operation/EditFishingOperationUIModel.java | 1 - .../create/CreateBenthosBatchUIHandler.java | 3 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 16 ++++++ .../ui/swing/util/attachment/ButtonAttachment.java | 4 +- 14 files changed, 88 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm