This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 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 new be5249d Fixes #6112 Merge branch 'feature/6112' into develop The 1 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 be5249df569d3532f8f6470dcd1a0d357ab0c632 Merge: e876710 9ba8340 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 24 09:15:32 2015 +0100 Fixes #6112 Merge branch 'feature/6112' into develop Summary of changes: .../src/main/filtered-resources/log4j.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 10 +- .../operation/catches/EditCatchesUIHandler.java | 35 ++++++- .../operation/catches/benthos/BenthosBatchUI.css | 2 - .../catches/benthos/BenthosBatchUIHandler.java | 28 +++++- .../benthos/actions/RemoveBenthosBatchAction.java | 109 ++++++++++++++------- .../benthos/create/CreateBenthosBatchUI.css | 10 ++ .../benthos/create/CreateBenthosBatchUI.jaxx | 1 + ...=> CreateBenthosBatchAndFrequenciesAction.java} | 29 ++++-- .../frequency/BenthosFrequencyCellComponent.java | 28 +++--- .../operation/catches/species/SpeciesBatchUI.css | 2 - .../catches/species/SpeciesBatchUIHandler.java | 26 ++++- .../species/actions/RemoveSpeciesBatchAction.java | 102 +++++++++++++------ .../species/create/CreateSpeciesBatchUI.css | 10 ++ .../species/create/CreateSpeciesBatchUI.jaxx | 1 + ...=> CreateSpeciesBatchAndFrequenciesAction.java} | 27 +++-- .../frequency/SpeciesFrequencyCellComponent.java | 20 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 12 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 16 ++- 19 files changed, 350 insertions(+), 124 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>.