branch develop updated (b05a2c3 -> 4661866)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from b05a2c3 Pour le calcul des jours de mers, on se base sur tous les contacts de la ligne et pas seulement ceux sur la période sinon il manque les marées commencées avant le premier mois (fixes #6246) new 4661866 On permet l'import des espèces depuis tous les programmes (scléro n'est pas dispo) (refs #5973) The 1 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 46618669aaf0c6b7eb846d8dc9350ab1b2901092 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 8 15:10:41 2014 +0100 On permet l'import des espèces depuis tous les programmes (scléro n'est pas dispo) (refs #5973) Summary of changes: .../administration/referential-management.jsp | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 46618669aaf0c6b7eb846d8dc9350ab1b2901092 Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 8 15:10:41 2014 +0100 On permet l'import des espèces depuis tous les programmes (scléro n'est pas dispo) (refs #5973) --- .../administration/referential-management.jsp | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp index b3d6b83..b550216 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp @@ -101,23 +101,21 @@ </s:form> </s:if> - <s:if test="sclerochronology"> - <s:form action="import-species" method="POST" enctype="multipart/form-data"> + <s:form action="import-species" method="POST" enctype="multipart/form-data"> - <fieldset> - <legend> - <s:text name="wao.import.species.prompt" /> - </legend> + <fieldset> + <legend> + <s:text name="wao.import.species.prompt" /> + </legend> - <s:file name="csvFile" cssClass="float-left" /> + <s:file name="csvFile" cssClass="float-left" /> - <s:submit type="button"> - <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport" /> - </s:submit> - </fieldset> + <s:submit type="button"> + <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport" /> + </s:submit> + </fieldset> - </s:form> - </s:if> + </s:form> <table class="table table-bordered"> <tr> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm