This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from e004221 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 87cbc54 Passage sur la dernière version de codelutinpom new 47365c8 Utilisation de struts.properties pour y stoquer la taille max autorisé pour un upload (See #7900) new e5a8cc1 Chargement dans le context applicatif de la taille max d'un upload et propagation dans les actions concernées new 3fe440f Mise en place du contrôle de la taille côté client new 1751642 Amélioration de la validation du formulaire d'import common new 26ae9d2 Fixes #7900. Merge branch 'feature/7900' into develop The 6 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 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 commit 87cbc54067724bf12a170d035379a146f5aee88a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:26:38 2016 +0100 Passage sur la dernière version de codelutinpom commit 1751642b7204687aa4b151a28508d6a71e54461c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:23:35 2016 +0100 Amélioration de la validation du formulaire d'import common commit 3fe440fd810840705446db62eca81fa78dd3edcb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:22:10 2016 +0100 Mise en place du contrôle de la taille côté client commit e5a8cc1b11fed5f7b7cd8580c72687a61f0d4ba5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:20:36 2016 +0100 Chargement dans le context applicatif de la taille max d'un upload et propagation dans les actions concernées commit 47365c8dc7b3eb61ba5c9e4c9358239c2562adae Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:18:32 2016 +0100 Utilisation de struts.properties pour y stoquer la taille max autorisé pour un upload (See #7900) Summary of changes: .../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 ++ pom.xml | 2 +- 18 files changed, 226 insertions(+), 85 deletions(-) create mode 100644 echobase-ui/src/main/resources/struts.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.