branch feature/1319_wrong_folder created (now 32dda9f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1319_wrong_folder in repository jtimer. See http://git.chorem.org/jtimer.git at 32dda9f Fix 'templates' folder location This branch includes the following new commits: new 8870217 Fix documentation (wrong folder; incorrect file extension) new 32dda9f Fix 'templates' folder location 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 32dda9fed6ed1d2a62ea5c914953c2a132ca01c0 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Mar 9 07:26:19 2016 +0100 Fix 'templates' folder location commit 8870217d39179976ae931fe353ae4bd2bd36518a Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Mar 9 07:20:23 2016 +0100 Fix documentation (wrong folder; incorrect file extension) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1319_wrong_folder in repository jtimer. See http://git.chorem.org/jtimer.git commit 8870217d39179976ae931fe353ae4bd2bd36518a Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Mar 9 07:20:23 2016 +0100 Fix documentation (wrong folder; incorrect file extension) --- src/site/rst/configuration.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/rst/configuration.rst b/src/site/rst/configuration.rst index e2ba12e..620f96c 100644 --- a/src/site/rst/configuration.rst +++ b/src/site/rst/configuration.rst @@ -43,9 +43,9 @@ Default idle time is ``300`` seconds (5 minutes). It is possible to modify this Task template ------------- jTimer can create a task using subtask template. You can specify template, as yaml format, by creating -a file into ``${userHome}/.gtimer/template`` directory (one file per template). +a file into ``${userHome}/.gtimer/templates`` directory (one file per template). -For example, in file ``templatename1.txt``:: +For example, in file ``templatename1.yml``:: dev: E1: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1319_wrong_folder in repository jtimer. See http://git.chorem.org/jtimer.git commit 32dda9fed6ed1d2a62ea5c914953c2a132ca01c0 Author: Arnaud Thimel <thimel@codelutin.com> Date: Wed Mar 9 07:26:19 2016 +0100 Fix 'templates' folder location --- src/main/java/org/chorem/jtimer/JTimerConfig.java | 3 ++- src/site/rst/configuration.rst | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimerConfig.java b/src/main/java/org/chorem/jtimer/JTimerConfig.java index ac98d49..207c10d 100644 --- a/src/main/java/org/chorem/jtimer/JTimerConfig.java +++ b/src/main/java/org/chorem/jtimer/JTimerConfig.java @@ -220,10 +220,11 @@ public class JTimerConfig { protected enum JTimerOption { CONFIG_FILENAME(ApplicationConfig.CONFIG_FILE_NAME, "jtimer.properties"), + CONFIG_DIRECTORY("jtimer.config.directory", "${user.home}/.jtimer"), IO_SAVER_CLASS("jtimer.io.saver.class", "org.chorem.jtimer.io.GTimerIncrementalSaver"), IO_SAVER_DIRECTORY("jtimer.io.saver.directory", "${user.home}/.gtimer"), IO_SAVER_AUTOSAVEDELAY("jtimer.io.saver.autosavedelay", "300"), - UI_TEMPLATE_DIRECTORY("jtimer.ui.template.directory", "${jtimer.io.saver.directory}/templates"), + UI_TEMPLATE_DIRECTORY("jtimer.ui.template.directory", "${jtimer.config.directory}/templates"), UI_IDLE_TIME("jtimer.ui.idletime", "300"), UI_SHOW_CLOSED("jtimer.ui.showclosed", "false"), UI_CLOSE_TO_SYSTRAY("jtimer.ui.closetosystray", "true"), diff --git a/src/site/rst/configuration.rst b/src/site/rst/configuration.rst index 620f96c..7810203 100644 --- a/src/site/rst/configuration.rst +++ b/src/site/rst/configuration.rst @@ -43,7 +43,7 @@ Default idle time is ``300`` seconds (5 minutes). It is possible to modify this Task template ------------- jTimer can create a task using subtask template. You can specify template, as yaml format, by creating -a file into ``${userHome}/.gtimer/templates`` directory (one file per template). +a file into ``${userHome}/.jtimer/templates`` directory (one file per template). For example, in file ``templatename1.yml``:: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm