branch master updated (837d5f8 -> 307bb66)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 837d5f8 [jgitflow-maven-plugin]merging 'release/4.5-alpha-2' into 'master' adds 251b373 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6083ba6 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 64e8698 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5812976 Watch out! pom9 adds 7a3522b Utilisation i18n 3.4.1 (compatible java 8) adds c19bfd4 Utilisation bonne xsd sur le descripteur de site adds 19a8f67 chargement des pj des obs individuelles (fixes #8050) adds 8de3323 sauvegarde des pj des lignes non sauvegardées (fixes #8050) adds 8596547 - on ne peut pas utiliser les methodes default des les interfaces (dommage) - correction sur la suppression de pj non sauvées fixes #8050) adds c1fc87d Ajout clef i18n manquantes adds 636f9ff Fixes #8050 Merge branch 'feature/8050' into develop adds 593403e déplacement de l'éditeur de caractéristiques dans l'ecran des mensurations : il remplace la table des observations individuelles (fixes #8049) adds cffd094 Fixes #8049 Merge branch 'feature/8049' into develop adds d74ef21 on réajoute une ligne vide si y a plus d eligens (fixes #8057) adds 1b2e065 Fixes #8057 Merge branch 'feature/8057' into develop adds b6bce86 - ajout du listener de modif sur les lignes existantes - reajout du listener de modif des lignes d'obs indiv pour que le reset fonctionne fixes #8060 adds 07b9a79 Fixes #8060 Merge branch 'feature/8060' into develop adds 1bfceae on vérifie qu'il y a des lignes non vides dans le tableau des observations (refs #8059) adds 5e7fece on vérifie que les caractéristiques n'ont pas de valeurs (fixes #8059) adds 7fcb7ae Use java 8 Objects API adds 0f4067f Fixes #8059 Merge branch 'feature/8059' into develop adds 463351f force le mode rafale et l'ajout de la mensuration en obs indiv quand on passe en mode de recopie (fixes #8074) adds 3263747 Fixes #8074 Merge branch 'feature/8074' into develop adds c26e4fb on calcule les tailles et poids de toutes les lignes valides (refs #8065) adds 9037717 filtre des observations vides avant de sauver (refs #8065) adds 00e74af filtre des lignes vides (fixes #8065) adds f82aee1 on calcule les tailles et poids de toutes les lignes valides (refs #8065) adds f619e61 bullshit... adds a496bb1 on vérifie qu'on n'est pas en train de recalculer les lignes (fixes #8065) adds 6bcebaa Use a try-finally to be sure to change back state adds d55670e Fixes #8065 Merge branch 'feature/8065' into develop adds ce98818 [jgitflow-maven-plugin]updating poms for 4.5-alpha-3 branch with snapshot versions adds 2297f20 Fix m-source-p configuration adds 9713d49 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-3' with non-snapshot versions adds 307bb66 [jgitflow-maven-plugin]merging 'release/4.5-alpha-3' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 12 +- src/site/site_fr.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../persistence/entities/CaracteristicMap.java | 5 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/operation/catches/EditCatchesUI.jaxx | 6 - .../operation/catches/EditCatchesUIHandler.java | 6 - .../IndividualObservationBatchRowModel.java | 9 + .../IndividualObservationBatchTableModel.java | 6 +- .../catches/species/SpeciesBatchUIHandler.java | 48 +++++- .../species/frequency/SpeciesFrequencyUI.jaxx | 22 ++- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 187 +++++++++++++-------- .../species/frequency/SpeciesFrequencyUIModel.java | 50 ++++-- .../frequency/actions/RemoveObservationAction.java | 4 - .../swing/util/attachment/AttachmentItemModel.java | 7 + .../util/attachment/AttachmentModelAware.java | 6 + .../attachment/actions/AddAttachmentAction.java | 6 +- .../attachment/actions/OpenAttachmentAction.java | 9 +- .../attachment/actions/RemoveAttachmentAction.java | 5 +- .../attachment/actions/SaveAttachmentAction.java | 6 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + 26 files changed, 293 insertions(+), 127 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm