This is an automated email from the git hooks/post-receive script. New change to branch feature/8192 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits cdbec1d utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) omits 3752234 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' new bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) new dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) 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 (cdbec1d) \ N -- N -- N refs/heads/feature/8192 (dadc607) 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. The 2 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 dadc607c255379fa76f8460ab9cff0c9a0eff926 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 25 12:35:53 2016 +0100 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) commit bfbdf45e088e4da4af34ce513afa5eb1436e431a Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 25 12:30:28 2016 +0100 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 -- .../main/java/fr/ifremer/tutti/util/Weights.java | 68 ++++++++++++++++++---- .../frequency/SpeciesFrequencyTableModel.java | 9 +-- .../species/frequency/SpeciesFrequencyUI.jaxx | 20 ++++--- .../frequency/SpeciesFrequencyUIHandler.java | 10 +++- .../species/frequency/SpeciesFrequencyUIModel.java | 7 ++- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 49 ++++++++++++++++ 7 files changed, 136 insertions(+), 33 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.