This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit f5bb858406547c39c947a324aa6f6ca780d5c601 Merge: dad5aa1 6072d69 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:46 2016 +0200 Livrable #8181 Merge branch 'feature/8181' into develop .../echobase/entities/references/Gears.java | 41 ------- .../echobase/services/service/DbEditorService.java | 10 +- .../contexts/ImportDataContextSupport.java | 3 +- .../GearCharacteristicValuesImportModel.java | 39 +++++++ .../GearCharacteristicValuesImportRow.java | 47 ++++++++ .../services/service/importdb/ImportService.java | 76 +++++++++++++ .../dbeditor/ImportGearCharacteristics.java | 122 +++++++++++++++++++++ .../src/main/resources/config/struts-dbeditor.xml | 9 ++ .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 +++ 11 files changed, 316 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.