This is an automated email from the git hooks/post-receive script. New change to branch feature/8066 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards 97d710c ajout du champ et de la colonne du code de prelevement (refs #8066) adds d18be98 ajout d'un veto quand on change d'écran + avertissement si on quitte l'ecran des observations (fixes #8147) adds d9e77cf fix build adds a901071 Fixes #8147 Merge branch 'feature/8147' into develop adds 22a4586 ajout du champ et de la colonne du code de prelevement (refs #8066) adds 9828b19 ajout de la conf du code de prélèvement (refs #8147) adds 0df0b69 ajout dans la conf du prefix de code de prélèvement (refs #8066) adds e0688b0 ajout dans la conf du separateur de code de prelevement (refs #8066) adds 5b82d33 debut de l'editeur de code de prelevement (à ameliorer) (refs #8066) 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 (97d710c) \ N -- N -- N refs/heads/feature/8066 (5b82d33) 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: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 17 ++ .../i18n/tutti-persistence_en_GB.properties | 2 + .../i18n/tutti-persistence_fr_FR.properties | 2 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 24 ++- .../tutti/ui/swing/content/MainUIHandler.java | 57 +++--- .../actions/AbstractChangeScreenAction.java | 9 +- .../swing/content/config/TuttiConfigUIHandler.java | 6 + .../IndividualObservationBatchRowModel.java | 5 + .../SamplingCodeCellEditor.java | 199 +++++++++++++++++++++ .../frequency/SpeciesFrequencyUIHandler.java | 44 +++++ .../actions/CancelEditSpeciesFrequencyAction.java | 30 +--- .../tutti/ui/swing/util/TuttiExceptionHandler.java | 4 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +- .../tutti/ui/swing/BeanValidatorDetectorTest.java | 9 - 16 files changed, 353 insertions(+), 71 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/SamplingCodeCellEditor.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.