This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from e72c6d7 ajout de la constant label pour le label traduit (refs #7698) new 028920c migration de l'écran de calcul des données (refs #7679) new 8564b8f maj fichier de traduction (refs #7679) new 270aa57 Merge branch 'feature/7679' into develop The 3 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 270aa576037041815b506fad53e8b6fdfae806c5 Merge: e72c6d7 8564b8f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 15:24:14 2015 +0100 Merge branch 'feature/7679' into develop commit 8564b8f7a0a5f51661c0419af62e440307bb99b7 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 15:22:19 2015 +0100 maj fichier de traduction (refs #7679) commit 028920cbed3e19cc92159676616305152aa7fa0f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 14:59:24 2015 +0100 migration de l'écran de calcul des données (refs #7679) Summary of changes: .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../ui/admin/consolidate/ConsolidateModel.java | 45 ------ .../ui/admin/consolidate/ConsolidateUIHandler.java | 159 +++++++++------------ .../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 +- 10 files changed, 109 insertions(+), 140 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.