This is an automated email from the git hooks/post-receive script. New change to branch feature/6112 in repository tutti. See http://git.codelutin.com/tutti.git discards 990eb96 suppression multiple dans les listes de lots (fixes #6112) adds 5a7656b ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds f1b6e6f ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) adds 9e82f1e Mise à jour du mapping de l'aide en ligne adds 23d3230 Mise à jour du mapping de l'aide en ligne adds f504b6c - le poids de sous echantillon doit etre strictement inferieru au poids de catégorie - i18n (refs #7278) adds 686280c correction de la validation (les poids ventilés supérieurs au poids du lot, si on met un poids de sous echantillon, l'erreur ne disparait pas) (fixes #7278) adds 4de1cf6 Renommage de batchSampleWeight en batchSampleCategoryWeight (See #7278) adds 17a6ec6 Fixes #7278 Merge branch 'feature/7278' into develop adds 8dcabb7 permettre d'accéder aux mensuration directement après avroi créé le lot (refs #7157) adds 894bf43 permettre de mesurer le lot benthos tout juste créé (fixes #7157) adds d1b16dd Mise à jour du mapping de l'aide en ligne adds 3b15b01 sléection du premier lot mesurable (soit le lot créé s'il n'y a pas de catégorisation, soit le premier fils) (fixes #7157) adds 5d5af52 Fix help mapping adds e876710 Fixes #7157 Merge branch 'feature/7157' into develop adds dd5036d suppression multiple dans les listes de lots (fixes #6112) adds 67e7340 Correction de l'algorithme de suppression des lots en masse (ne pas supprimer un lot si son parent a déjà été supprimé) (See #6112) adds 9ba8340 Changement des niveaux de logs This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (990eb96) \ N -- N -- N refs/heads/feature/6112 (9ba8340) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../src/main/filtered-resources/log4j.properties | 6 ++-- .../filtered-resources/tutti-help-fr.properties | 10 ++++-- .../operation/catches/EditCatchesUIHandler.java | 35 ++++++++++++++++++--- .../catches/benthos/BenthosBatchUIHandler.java | 14 +++++++-- .../benthos/actions/RemoveBenthosBatchAction.java | 30 ++++++++++++++++-- .../benthos/create/CreateBenthosBatchUI.css | 27 +++++++++++++++- .../benthos/create/CreateBenthosBatchUI.jaxx | 12 ++++++++ .../create/CreateBenthosBatchUIHandler.java | 1 + .../benthos/create/CreateBenthosBatchUIModel.java | 36 ++++++++++++++++++++-- ...=> CreateBenthosBatchAndFrequenciesAction.java} | 29 ++++++++++++----- .../frequency/BenthosFrequencyCellComponent.java | 28 ++++++++--------- .../catches/species/SpeciesBatchUIHandler.java | 11 +++++-- .../species/actions/RemoveSpeciesBatchAction.java | 31 +++++++++++++++++-- .../species/create/CreateSpeciesBatchUI.css | 27 +++++++++++++++- .../species/create/CreateSpeciesBatchUI.jaxx | 12 ++++++++ .../create/CreateSpeciesBatchUIHandler.java | 1 + .../species/create/CreateSpeciesBatchUIModel.java | 31 +++++++++++++++++++ ...=> CreateSpeciesBatchAndFrequenciesAction.java} | 27 ++++++++++++---- .../frequency/SpeciesFrequencyCellComponent.java | 20 +++++++----- .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++++++++++++++----- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 ++++++++++++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 23 ++++++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 25 ++++++++++++--- 23 files changed, 425 insertions(+), 76 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/{CreateBenthosBatchAndContinueAction.java => CreateBenthosBatchAndFrequenciesAction.java} (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/actions/{CreateSpeciesBatchAndCloseAction.java => CreateSpeciesBatchAndFrequenciesAction.java} (62%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.