This is an automated email from the git hooks/post-receive script. New change to branch feature/7025 in repository tutti. See http://git.codelutin.com/tutti.git discards 98ebee4 pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) 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 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 (98ebee4) \ N -- N -- N refs/heads/feature/7025 (1e88649) 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 | 22 ++++++------ .../catches/SpeciesAbleBatchRowHelper.java | 4 --- .../catches/benthos/BenthosBatchUIHandler.java | 40 +++++++++++++++++----- .../catches/species/SpeciesBatchUIHandler.java | 40 +++++++++++++++++----- .../EditProtocolCaracteristicsRowModel.java | 7 ++++ .../EditProtocolCaracteristicsTableModel.java | 4 ++- .../EditProtocolOperationFieldsRowModel.java | 4 +++ .../EditProtocolOperationFieldsTableModel.java | 2 ++ .../protocol/EditProtocolSpeciesTableModel.java | 4 +-- .../content/protocol/EditProtocolUIHandler.java | 39 ++++++++++++++++++--- .../content/protocol/EditProtocolUIModel.java | 1 + .../MoveDownCaracteristicMappingAction.java | 6 ++-- .../actions/MoveUpCaracteristicMappingAction.java | 6 ++-- .../swing/util/table/AbstractTuttiTableModel.java | 4 ++- 14 files changed, 137 insertions(+), 46 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.