This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 23ed87befa215598365272c7385c84f8c7d401e2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 19 11:42:33 2014 +0200 fix doc urls --- .../src/main/webapp/WEB-INF/decorators/layout-default.jsp | 6 +++--- src/site/site_en.xml | 1 - src/site/site_fr.xml | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp index 29a367f..81184fd 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp @@ -332,8 +332,8 @@ <!-- Pied de page --> <div id="po-footer" class="<s:property value='%{pageLogo}'/>" xml:space="preserve"> - <a href="http://maven-site.chorem.org/pollen">Pollen</a> - <a href="http://www.chorem.org/projects/pollen/files"> + <a href="https://pollen.chorem.org/s">Pollen</a> + <a href="https://forge.chorem.org/projects/pollen/files"> <%=PollenActionSupport.getApplicationVersion()%> </a> - <a href="http://www.gnu.org/licenses/agpl.html"> @@ -341,7 +341,7 @@ </a> - <span title="Copyright">©2009-2012</span> <a href="http://www.codelutin.com">Code Lutin</a> - - <a href="http://www.chorem.org/projects/pollen/issues"> + <a href="https://forge.chorem.org/projects/pollen/issues"> <s:text name="pollen.common.bugReport"/> </a> - <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users"> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 5930057..3d6361b 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -84,7 +84,6 @@ <item name="Official instance (Use last stable version of Pollen, No data loss)" href="http://pollen.chorem.org/"/> <item name="Test instance (latest) (Use last dev version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen-latest"/> <item name="Test instance (staging) (Use next release version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen-staging"/> - <item name="Test instance (stable) (Use last stable release version of Pollen, Test purpose only)" href="http://demo.codelutin.com/pollen-stable"/> </menu> <menu name="Language"> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 3b23714..fe1ca4b 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -81,10 +81,9 @@ </menu> <menu name="Instances publiques"> - <item name="Instance officielle (utilise la dernière version stable, Pas de perte de données)" href="http://pollen.chorem.org/"/> - <item name="Instance de tests (latest) (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen-latest"/> - <item name="Instance de tests (staging) (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen-staging"/> - <item name="Instance de tests (stable) (utilise la dernière version de dev, pour tests uniquement)" href="http://demo.codelutin.com/pollen-stable"/> + <item name="Instance officielle (utilise la dernière version stable, Pas de perte de données)" href="https://pollen.chorem.org/"/> + <item name="Instance de tests (latest) (utilise la dernière version de dev, pour tests uniquement)" href="https://demo.codelutin.com/pollen-latest"/> + <item name="Instance de tests (staging) (utilise la dernière version stable avant diffusion publique, pour tests uniquement)" href="https://demo.codelutin.com/pollen-staging"/> </menu> <menu name="Langue"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.