This is an automated email from the git hooks/post-receive script. New change to branch feature/7930 in repository tutti. See http://git.codelutin.com/tutti.git discards bda70af Fin de merge depuis develop discards 0cd8d57 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) discards 71fc127 creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) adds 9c8dc7b Correction de la taille des boutons (See #7971) adds 46082fc Correction d'un binding qui ne fonctionnait plus... adds 36b113c creation de l'onglet d'edition de l'algo de prelevement de pieces calcifiees (refs #7930) adds 6b43543 combo de selection de l'espece + ajout de lignes dans le tableau + possibilité de splitter une ligne (refs #7930) adds e21ec1d Fin de merge depuis develop adds 75562f8 Ajout de la propriété programId sur le modèle d'un protocole (sert à filtrer les protocole d'une série de campagne) adds 53176df Ajout d'une méthode de persistence pour ne récupérer que les protocoles d'une série de campagne adds ccfa7fb Filtrer les protocoles par série de campagne adds f977238 Charger le modèle des strates dispnibles plus haut + ne pas reproposer à la sélection des strates et sous-strates déjà dans le protocole 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 (bda70af) \ N -- N -- N refs/heads/feature/7930 (f977238) 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: .../tutti/persistence/TuttiPersistenceImpl.java | 5 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../entities/protocol/TuttiProtocols.java | 5 ++ .../service/ProtocolPersistenceService.java | 7 +++ .../service/ProtocolPersistenceServiceImpl.java | 19 ++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 60851 -> 60983 bytes .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../ui/swing/content/home/SelectCruiseUI.jcss | 4 ++ .../swing/content/home/SelectCruiseUIHandler.java | 25 +++++++- .../content/protocol/EditProtocolUIHandler.java | 64 +++++++++++++++++++++ .../content/protocol/EditProtocolUIModel.java | 14 ++++- .../protocol/zones/ZoneEditorUIHandler.java | 45 ++------------- .../tutti/ui/swing/content/report/ReportUI.jaxx | 15 ++++- .../tutti/ui/swing/content/report/ReportUI.jcss | 4 +- 14 files changed, 170 insertions(+), 47 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.