This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 5ad75f1389793c2698221024c714c4ac248ffe5f Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri May 25 15:42:48 2018 +0200 Fix website --- .gitlab-ci.yml | 2 -- src/site/rst/index.rst.vm | 18 +++--------------- src/site/site.xml | 5 ++--- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91de5fb..49b8156 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,8 +11,6 @@ build: pages: stage: reporting - only: - - master artifacts: paths: - public diff --git a/src/site/rst/index.rst.vm b/src/site/rst/index.rst.vm index efd87eb..9d49e42 100644 --- a/src/site/rst/index.rst.vm +++ b/src/site/rst/index.rst.vm @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2007 - 2016 CodeLutin +.. * Copyright (C) 2007 - 2018 CodeLutin .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as @@ -43,20 +43,8 @@ Download -------- jTimer is Java_ based. You need to install JRE 8 environment to use it. -`Download jTimer ${project.version}`_. +`Download jTimer`_. -Start ------ - -Since version 1.4.3, you can directly use jTimer without install it by hand, -using the webstart technology. - -`Start jTimer via webstart`_. - -For more information, go to page `jnlp documentation`_. - -.. _Download jTimer ${project.version}: https://forge.chorem.org/projects/jtimer/files +.. _Download jTimer: https://gitlab.nuiton.org/chorem/jtimer/tags .. _Java: http://java.sun.com/javase/downloads/index.jsp .. _gTimer: http://www.k5n.us/gtimer.php -.. _Start jTimer via webstart: jnlp/${jnlpFileName} -.. _jnlp documentation: jnlp-report.html \ No newline at end of file diff --git a/src/site/site.xml b/src/site/site.xml index 0aebc75..3dd5e3e 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -51,8 +51,7 @@ <body> <links> - <item name="nuiton.org" href="https://forge.nuiton.org"/> - <item name="chorem.org" href="https://forge.chorem.org"/> + <item name="nuiton.org" href="https://gitlab.nuiton.org"/> <item name="CodeLutin" href="https://codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> @@ -70,7 +69,7 @@ </menu> <menu name="Contribute" inherit="top"> - <item name="Forge" href="https://forge.chorem.org/projects/jtimer"/> + <item name="Forge" href="https://gitlab.nuiton.org"/> <item name="Bug tracker" href="https://gitlab.nuiton.org/chorem/jtimer/issues"/> <item name="I18N" href="contribute/i18n.html"/> </menu> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.