branch develop updated (6259493 -> c512700)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 6259493 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new fe71901 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1d6a5d3 [maven-release-plugin] copy for tag jtimer-1.4.3 adds 6bdd6ad [jgitflow-maven-plugin]updating poms for 1.5 branch with snapshot versions new ab2fada [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions new a6f2b93 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' new d9d5257 [jgitflow-maven-plugin]merging 'master' into 'develop' new c512700 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 c5127005e568a52b4c526ce4df28c2e05b766b43 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:54 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d9d5257a926164326e807f8c9c16214aada6996f Merge: fe71901 a6f2b93 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:54 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit fe7190131821f3fda5385125036a01f36523d25b Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:54 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a6f2b93894945713488629499c5e89e1b68e218d Merge: 1d6a5d3 ab2fada Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:53 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' commit ab2fada4e2d68ad2124a24f2c79ea114c413ebb1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:31:35 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions Summary of changes: -- 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 develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit ab2fada4e2d68ad2124a24f2c79ea114c413ebb1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:31:35 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 929af0b..0a07b51 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <name>jTimer</name> <description> -- 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 develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit a6f2b93894945713488629499c5e89e1b68e218d Merge: 1d6a5d3 ab2fada Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:53 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' .gitignore | 19 + README.txt => README.md | 16 +- pom.xml | 254 ++--- src/main/assembly/bin.xml | 7 +- src/main/assembly/src.xml | 45 - src/main/config/checkstyle.xml | 3 - src/main/java/org/chorem/jtimer/JTimer.java | 291 +++--- src/main/java/org/chorem/jtimer/JTimerActions.java | 3 - src/main/java/org/chorem/jtimer/JTimerConfig.java | 125 ++- src/main/java/org/chorem/jtimer/JTimerFactory.java | 70 +- .../org/chorem/jtimer/data/CommonVetoable.java | 3 - .../org/chorem/jtimer/data/DataEventListener.java | 35 +- .../chorem/jtimer/data/DataViolationException.java | 3 - .../java/org/chorem/jtimer/data/TimerCore.java | 74 +- .../org/chorem/jtimer/data/TimerDataManager.java | 54 +- .../jtimer/data/VetoableDataEventListener.java | 3 - .../java/org/chorem/jtimer/data/package-info.java | 3 - .../org/chorem/jtimer/entities/TimerAlert.java | 3 - .../org/chorem/jtimer/entities/TimerProject.java | 24 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 21 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 67 +- .../org/chorem/jtimer/entities/package-info.java | 3 - .../java/org/chorem/jtimer/io/AbstractSaver.java | 3 - .../org/chorem/jtimer/io/DataLockingException.java | 3 - .../chorem/jtimer/io/GTimerIncrementalSaver.java | 585 ++++++----- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 3 - src/main/java/org/chorem/jtimer/io/Saver.java | 18 +- .../java/org/chorem/jtimer/io/package-info.java | 3 - src/main/java/org/chorem/jtimer/package-info.java | 3 - src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 9 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 172 ++++ src/main/java/org/chorem/jtimer/ui/StatusBar.java | 9 +- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 355 ++----- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 11 +- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 9 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 7 +- .../chorem/jtimer/ui/alert/AlertTableModel.java | 5 +- .../java/org/chorem/jtimer/ui/package-info.java | 3 - .../chorem/jtimer/ui/report/ReportGenerator.java | 52 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 15 +- .../org/chorem/jtimer/ui/report/ReportView.java | 230 ++--- .../org/chorem/jtimer/ui/report/package-info.java | 3 - .../org/chorem/jtimer/ui/system/SystemInfo.java | 5 +- .../chorem/jtimer/ui/system/SystemInfoFactory.java | 3 - .../ui/system/UnsupportedSystemInfoException.java | 3 - .../ui/system/macos/ApplicationServices.java | 9 +- .../jtimer/ui/system/macos/MacOSSystemInfo.java | 3 - .../jtimer/ui/system/macos/package-info.java | 3 - .../org/chorem/jtimer/ui/system/package-info.java | 3 - .../jtimer/ui/system/unix/UnixSystemInfo.java | 4 - .../java/org/chorem/jtimer/ui/system/unix/X11.java | 42 + .../java/org/chorem/jtimer/ui/system/unix/Xss.java | 20 +- .../chorem/jtimer/ui/system/unix/package-info.java | 3 - .../system/win32/Kernel32.java} | 45 +- .../org/chorem/jtimer/ui/system/win32/User32.java | 13 +- .../jtimer/ui/system/win32/Win32SystemInfo.java | 7 +- .../jtimer/ui/system/win32/package-info.java | 3 - .../chorem/jtimer/ui/systray/SystrayManager.java | 10 +- .../org/chorem/jtimer/ui/systray/package-info.java | 3 - .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 276 ++++-- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 3 - .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 71 +- .../org/chorem/jtimer/ui/tasks/package-info.java | 3 - .../tree/CheckBoxTreeCellComponent.java | 19 +- .../{report => }/tree/CheckBoxTreeCellEditor.java | 7 +- .../tree/CheckBoxTreeCellRenderer.java | 12 +- .../jtimer/ui/tree/ProjectsAndTasksTree.java | 60 ++ .../TaskTreeModel.java} | 33 +- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 272 +---- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 51 +- ...va => ProjectsAndTasksRunningCellRenderer.java} | 68 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 48 +- .../ui/treetable/dnd/TimerTaskTranferable.java | 3 - .../ui/treetable/dnd/TimerTaskTransferHandler.java | 21 +- .../jtimer/ui/treetable/dnd/package-info.java | 3 - .../chorem/jtimer/ui/treetable/package-info.java | 3 - .../org/chorem/jtimer/ui/widget/DialogView.java | 73 ++ .../chorem/jtimer/ui/widget/DurationEditor.java | 3 - .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 3 - .../chorem/jtimer/ui/widget/WindowProperty2.java | 3 +- .../ui/ws/SwingConnectionInformationHandler.java | 360 ------- .../java/org/chorem/jtimer/ui/ws/package-info.java | 28 - .../org/chorem/jtimer/utils/DailySortedMap.java | 6 +- .../java/org/chorem/jtimer/utils/package-info.java | 3 - .../chorem/jtimer/ws/ConnectionDataHandler.java | 51 - .../org/chorem/jtimer/ws/ProjectManagement.java | 144 --- .../jtimer/ws/exception/WebServiceException.java | 59 -- .../chorem/jtimer/ws/exception/package-info.java | 28 - .../java/org/chorem/jtimer/ws/package-info.java | 28 - .../jtimer/ws/xmlrpc/AbstractXMLRPCClient.java | 87 -- .../jtimer/ws/xmlrpc/ChoremXMLRPCClient.java | 1047 -------------------- .../java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java | 248 ----- .../org/chorem/jtimer/ws/xmlrpc/package-info.java | 28 - src/main/resources/ftl/reportByDay.ftl | 9 +- src/main/resources/ftl/reportByDay_fr.ftl | 11 +- src/main/resources/ftl/reportByMonth.ftl | 9 +- src/main/resources/ftl/reportByMonth_fr.ftl | 9 +- src/main/resources/ftl/reportByProject.ftl | 7 +- src/main/resources/ftl/reportByProject_fr.ftl | 9 +- src/main/resources/ftl/reportByWeek.ftl | 9 +- src/main/resources/ftl/reportByWeek_fr.ftl | 11 +- src/main/resources/ftl/reportByYear.ftl | 10 +- src/main/resources/ftl/reportByYear_fr.ftl | 12 +- src/main/resources/jtimer.properties | 2 - src/main/resources/log4j.properties | 54 - src/main/resources/log4j2.xml | 38 + .../org/chorem/jtimer/resources/JTimer.properties | 88 +- .../chorem/jtimer/resources/JTimer_fr.properties | 83 +- .../ui/alert/resources/AlertEditor.properties | 13 +- .../ui/alert/resources/AlertEditor_fr.properties | 13 +- .../ui/report/resources/ReportView.properties | 19 +- .../ui/report/resources/ReportView_fr.properties | 17 +- .../jtimer/ui/report/resources/dialog-close.png | Bin 0 -> 1382 bytes .../jtimer/ui/resources/HelpFrame.properties | 11 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 11 +- .../NewTaskView.properties} | 17 +- .../NewTaskView_fr.properties} | 16 +- .../jtimer/ui/resources/StatusBar.properties | 5 +- .../jtimer/ui/resources/StatusBar_fr.properties | 5 +- .../jtimer/ui/resources/TimerTaskEditor.properties | 22 +- .../ui/resources/TimerTaskEditor_fr.properties | 22 +- .../chorem/jtimer/ui/resources/document-new.png | Bin 0 -> 1008 bytes .../ui/systray/resources/SystrayManager.properties | 9 +- .../systray/resources/SystrayManager_fr.properties | 9 +- .../ui/tasks/resources/IdleDialog.properties | 22 +- .../ui/tasks/resources/IdleDialog_fr.properties | 23 +- .../ui/tasks/resources/RunTaskJob.properties | 7 +- .../ui/tasks/resources/RunTaskJob_fr.properties | 7 +- .../ui/tasks/resources/document-revert-3.png | Bin 0 -> 2043 bytes .../resources/TimerTaskTransferHandler.properties | 14 +- .../TimerTaskTransferHandler_fr.properties | 10 +- .../resources/ProjectsAndTasksTable.properties | 9 +- .../resources/ProjectsAndTasksTable_fr.properties | 9 +- .../SwingConnectionInformationHandler.properties | 29 - ...SwingConnectionInformationHandler_fr.properties | 29 - src/site/en/rst/contribute/i18n.rst | 67 -- src/site/en/rst/devel/fileformat.rst | 127 --- src/site/en/rst/devel/index.rst | 57 -- src/site/en/rst/devel/roadmap.rst | 59 -- src/site/en/rst/devel/saf.rst | 127 --- src/site/en/rst/index.rst.vm | 66 -- src/site/en/rst/screenshots.rst | 54 - src/site/resources/images/jrst-logo.png | Bin 608 -> 0 bytes src/site/rst/configuration.rst | 60 ++ src/site/rst/contribute/i18n.rst | 35 +- src/site/rst/devel/fileformat.rst | 51 +- src/site/{en => }/rst/devel/idledetection.rst | 8 +- src/site/rst/devel/index.rst | 31 +- src/site/rst/devel/roadmap.rst | 32 +- src/site/rst/devel/saf.rst | 25 +- src/site/rst/index.rst.vm | 61 +- src/site/rst/screenshots.rst | 31 +- src/site/site.xml | 105 ++ src/site/site_en.xml | 117 --- src/site/site_fr.xml | 117 --- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 18 +- .../java/org/chorem/jtimer/JTimerFactoryTest.java | 39 +- .../org/chorem/jtimer/data/CommonVetoableTest.java | 9 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 16 +- .../org/chorem/jtimer/entities/TimerAlertTest.java | 9 +- .../chorem/jtimer/entities/TimerProjectTest.java | 17 - ...ctionDataTest.java => TimerTaskHelperTest.java} | 39 +- .../org/chorem/jtimer/entities/TimerTaskTest.java | 3 - .../org/chorem/jtimer/io/AbstractSaverTest.java | 3 - .../jtimer/io/GTimerIncrementalSaverTest.java | 19 +- .../jtimer/ui/report/ReportGeneratorTest.java | 33 +- .../chorem/jtimer/ui/report/ReportUtilsTest.java | 3 - .../jtimer/ui/system/SystemInfoFactoryTest.java | 3 - .../jtimer/ui/widget/DurationEditorTest.java | 3 - .../chorem/jtimer/utils/DailySortedMapTest.java | 62 +- src/test/resources/jtimertest.properties | 19 +- src/test/resources/templates/project1.txt | 11 + src/test/resources/templates/project2.yaml | 3 + 173 files changed, 2514 insertions(+), 5689 deletions(-) -- 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 develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit fe7190131821f3fda5385125036a01f36523d25b Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:54 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3432844..0a07b51 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> <name>jTimer</name> <description> -- 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 develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit d9d5257a926164326e807f8c9c16214aada6996f Merge: fe71901 a6f2b93 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:54 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit c5127005e568a52b4c526ce4df28c2e05b766b43 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 30 17:33:54 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0a07b51..3432844 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <name>jTimer</name> <description> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm