This is an automated email from the git hooks/post-receive script. New change to branch feature/7278 in repository tutti. See http://git.codelutin.com/tutti.git discards 93f5ca1 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) discards eb6d09a ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds d53f38b recuperation de la colonne des especes par son identifier plutot que par l'index, qui varie en fonction des colonnes cachées (fixes #7854) adds 76255ee Fixes #7854 Merge branch 'feature/7854' into develop adds c22d2df pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) adds fcdeafb Mise à jour de mapping de l'aide adds 1e88649 Reformatag, ajout serialVersionUID + bonne javadoc de création adds 256ba74 Fixes #7025 Merge branch 'feature/7025' into develop adds 277a2ee sélection du premier éléménent de la combo quand on arrive sur l'ecran à partir du menu en haut de l'ecran (fixes #7856) adds 8057682 Fixes #7856 Merge branch 'feature/7856' into develop adds 5db4316 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds add4323 ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) adds 4361fd8 Mise à jour du mapping de l'aide en ligne adds 41f9a91 Mise à jour du mapping de l'aide en ligne 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 (93f5ca1) \ N -- N -- N refs/heads/feature/7278 (41f9a91) 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: .../filtered-resources/tutti-help-fr.properties | 30 ++++++++-------- .../EditCatchesForSelectedCruiseAction.java | 34 ++++++++++++++++++ .../EditSampleCategoryModelTableModel.java | 14 ++------ .../content/home/actions/EditCatchesAction.java | 8 ++--- .../catches/SpeciesAbleBatchRowHelper.java | 4 --- .../catches/benthos/BenthosBatchUIHandler.java | 40 +++++++++++++++++----- .../catches/species/SpeciesBatchUIHandler.java | 40 +++++++++++++++++----- .../EditProtocolCaracteristicsRowModel.java | 7 ++++ .../EditProtocolCaracteristicsTableModel.java | 8 +++-- .../EditProtocolOperationFieldsRowModel.java | 4 +++ .../EditProtocolOperationFieldsTableModel.java | 2 ++ .../protocol/EditProtocolSpeciesTableModel.java | 4 +-- .../ui/swing/content/protocol/EditProtocolUI.css | 21 ++++++++++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 ++ .../content/protocol/EditProtocolUIHandler.java | 35 +++++++++++++++++-- .../content/protocol/EditProtocolUIModel.java | 27 +++++++++++++++ .../MoveDownCaracteristicMappingAction.java} | 22 ++++++------ .../actions/MoveUpCaracteristicMappingAction.java} | 22 ++++++------ .../swing/util/table/AbstractTuttiTableModel.java | 30 ++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 ++++ 21 files changed, 288 insertions(+), 78 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveDownSampleCategoryRowAction.java => protocol/actions/MoveDownCaracteristicMappingAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveUpSampleCategoryRowAction.java => protocol/actions/MoveUpCaracteristicMappingAction.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.