This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 26ae9d229b1411dc26e0a867a2d7a8976de071a7 Merge: 87cbc54 1751642 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:24:28 2016 +0100 Fixes #7900. Merge branch 'feature/7900' into develop .../echobase/ui/EchoBaseApplicationContext.java | 36 ++++++++-- .../importData/AbstractConfigureImport.java | 4 ++ .../actions/importData/ConfigureCommonImport.java | 84 +++++++++++++++++++--- .../echobase/ui/actions/importDb/Configure.java | 4 ++ ...onImport-configureCommon-modeAll-validation.xml | 28 ++++---- ...ort-configureCommon-modeTransect-validation.xml | 14 ++-- ...port-configureCommon-modeTransit-validation.xml | 8 +-- ...mport-configureCommon-modeVoyage-validation.xml | 14 ++-- echobase-ui/src/main/resources/struts.properties | 2 + echobase-ui/src/main/resources/struts.xml | 1 - .../src/main/webapp/WEB-INF/includes/metas.jsp | 28 +++++++- .../jsp/importData/configureAcousticImport.jsp | 1 + .../jsp/importData/configureCatchesImport.jsp | 2 +- .../jsp/importData/configureCommonImport.jsp | 67 ++++++++--------- .../jsp/importData/configureOperationImport.jsp | 7 ++ .../jsp/importData/configureResultsImport.jsp | 2 + .../main/webapp/WEB-INF/jsp/importDb/configure.jsp | 7 ++ 17 files changed, 225 insertions(+), 84 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.