branch develop updated (29a6950 -> b1d3b08)
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 29a6950 On évite un échappement (fixes #6488) new 5bd58fb Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) new b1d3b08 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) The 2 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 b1d3b087f97ea09115bc391309c0dc7c7daba346 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 16:31:56 2015 +0100 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) commit 5bd58fb07a845c7a69a1f5708ea39a1f82fb28d5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 16:27:01 2015 +0100 Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) Summary of changes: .../src/main/webapp/WEB-INF/content/administration/companies.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp | 9 --------- 2 files changed, 1 insertion(+), 10 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 5bd58fb07a845c7a69a1f5708ea39a1f82fb28d5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 16:27:01 2015 +0100 Correction du lien pour créer un utilisateur dans la liste des sociétés (fixes #6492) --- wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp index f48a4f1..20476e2 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/companies.jsp @@ -79,7 +79,7 @@ </s:a> <s:url action="edit-wao-user!input" id="createWaoUserUrl"> - <s:param name="companyId" value="topiaId" /> + <s:param name="organisationId" value="topiaId" /> </s:url> <s:a href="%{createWaoUserUrl}"> <i class="icon-plus"></i> <s:text name="wao.ui.action.createWaoUser" /> -- 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 b1d3b087f97ea09115bc391309c0dc7c7daba346 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 20 16:31:56 2015 +0100 On supprime les filtres sur les commentaires dans l'onglet synthèses (fixes #6493) --- wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp b/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp index c950ddc..b4b4dab 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp @@ -184,15 +184,6 @@ </s:if> - <s:checkbox name="filter.commentDefinedOnly" - label="%{getText('wao.ui.field.Contact.comment')}"/> - - <s:checkbox name="filter.commentCompanyDefinedOnly" - label="%{getText('wao.ui.field.Contact.commentCompany')}"/> - - <s:checkbox name="filter.commentAdminDefinedOnly" - label="%{getText('wao.ui.field.Contact.commentAdmin')}"/> - <s:checkbox name="filter.realVsEstimated" label="%{getText('wao.ui.form.realTides.description')}"/> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm