This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 926905443d201440e31226fb0b8de4583bc6e12f Merge: a3dc0a0 fc9a6f8 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Nov 6 08:38:41 2015 +0100 Merge branch 'feature/7677' into develop .../java/fr/ird/observe/ui/DecoratorService.java | 7 ++ .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 44 ++++++-- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 8 +- .../ird/observe/ui/admin/export/ExportModel.java | 82 +++++++------- .../observe/ui/admin/export/ExportUIHandler.java | 125 ++++++++++++--------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 26 ++--- .../ui/admin/export/TripToExportTableModel.java | 13 +-- .../fr/ird/observe/ui/storage/StorageUIModel.java | 5 + .../ui/tree/DataSelectionTreeCellRenderer.java | 15 +-- .../controller/v1/DataSourceServiceController.java | 6 + .../services/service/DataSourceService.java | 7 ++ .../fr/ird/observe/services/dto/ImportDataDto.java | 38 +++++++ .../services/service/DataSourceServiceTopia.java | 18 +++ 14 files changed, 256 insertions(+), 141 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.