This is an automated email from the git hooks/post-receive script. New change to branch feature/7699 in repository observe. See http://git.codelutin.com/observe.git discards 2883548 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext adds 028920c migration de l'écran de calcul des données (refs #7679) adds 8564b8f maj fichier de traduction (refs #7679) adds 270aa57 Merge branch 'feature/7679' into develop adds 02fad67 ne plus utiliser la fonction générique getObserveDto new 54001ed fixes #7699 Lier le ObserveOpenDataManager avec le DataContext 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 (2883548) \ N -- N -- N refs/heads/feature/7699 (54001ed) 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 1 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 54001ed6bd96175588c3c940360b371b9db7b3a2 Author: Kevin Morin <morin@codelutin.com> Date: Fri Nov 6 14:16:50 2015 +0100 fixes #7699 Lier le ObserveOpenDataManager avec le DataContext Summary of changes: .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../ui/admin/consolidate/ConsolidateModel.java | 45 ------ .../ui/admin/consolidate/ConsolidateUIHandler.java | 159 +++++++++------------ .../longline/GearUseFeaturesLonglineUIHandler.java | 7 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 7 +- .../observe-application-swing_en_GB.properties | 3 + .../observe-application-swing_es_ES.properties | 3 + .../observe-application-swing_fr_FR.properties | 3 + .../consolidate/ConsolidateDataService.java | 2 + .../java/fr/ird/observe/services/dto/IdDtos.java | 20 +++ .../services/ObserveServiceFactoryRest.java | 7 + .../service/seine/NonTargetCatchServiceTopia.java | 4 +- 12 files changed, 121 insertions(+), 142 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.