timetracker.git
7 years agoMerge branch 'avidenic-taskChanges'
Nik Okuntseff [Mon, 18 Jul 2016 18:17:43 +0000 (18:17 +0000)]
Merge branch 'avidenic-taskChanges'

7 years agoMerge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic...
Nik Okuntseff [Mon, 18 Jul 2016 18:16:52 +0000 (18:16 +0000)]
Merge branch 'taskChanges' of https://github.com/avidenic/timetracker into avidenic-taskChanges

Conflicts:
.gitignore
WEB-INF/config.php.dist

7 years agoFixed version.
Nik Okuntseff [Mon, 18 Jul 2016 17:43:23 +0000 (17:43 +0000)]
Fixed version.

7 years agoMerge branch 'avidenic-master'
Nik Okuntseff [Mon, 18 Jul 2016 17:32:00 +0000 (17:32 +0000)]
Merge branch 'avidenic-master'

7 years agoMerge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master
Nik Okuntseff [Mon, 18 Jul 2016 17:26:45 +0000 (17:26 +0000)]
Merge branch 'master' of https://github.com/avidenic/timetracker into avidenic-master

Conflicts:
.gitignore
WEB-INF/templates/footer.tpl

7 years agoPreparing to merge pull request #3.
Nik Okuntseff [Mon, 18 Jul 2016 16:52:38 +0000 (16:52 +0000)]
Preparing to merge pull request #3.

7 years agoAdded a check if templates_c dir is writable.
Nik Okuntseff [Sun, 17 Jul 2016 23:04:16 +0000 (23:04 +0000)]
Added a check if templates_c dir is writable.

7 years agoPut environment checks into dbinstall.php.
Nik Okuntseff [Sun, 17 Jul 2016 22:06:20 +0000 (22:06 +0000)]
Put environment checks into dbinstall.php.

7 years agoAdded environment_check.php file.
Nik Okuntseff [Sun, 17 Jul 2016 21:35:15 +0000 (21:35 +0000)]
Added environment_check.php file.

It provides troubleshooting for basic config errors.

7 years agofixed the comment
Anže Videnič [Mon, 4 Jul 2016 14:29:06 +0000 (16:29 +0200)]
fixed the comment

7 years agoMerge commit '5ce20fc5d56a32584f8a2d18ae7cde91eb12a5a4' into taskChanges
Anže Videnič [Mon, 4 Jul 2016 14:23:47 +0000 (16:23 +0200)]
Merge commit '5ce20fc5d56a32584f8a2d18ae7cde91eb12a5a4' into taskChanges

7 years agoadded an option to configure note input height
Anže Videnič [Mon, 4 Jul 2016 14:23:24 +0000 (16:23 +0200)]
added an option to configure note input height

7 years agoMerge remote-tracking branch 'upstream/master'
Anže Videnič [Mon, 4 Jul 2016 13:54:22 +0000 (15:54 +0200)]
Merge remote-tracking branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

7 years agoupdated according to comments from anuko
Anže Videnič [Mon, 4 Jul 2016 09:28:13 +0000 (11:28 +0200)]
updated according to comments from anuko

7 years agoRemoved cron_db_cleanup.php from repository to reduce accidental team deletion risk.
Nik Okuntseff [Sun, 12 Jun 2016 17:59:33 +0000 (17:59 +0000)]
Removed cron_db_cleanup.php from repository to reduce accidental team deletion risk.

7 years agoNot doing optimiziation when there is nothing to optimize.
Nik Okuntseff [Sun, 12 Jun 2016 17:03:24 +0000 (17:03 +0000)]
Not doing optimiziation when there is nothing to optimize.

7 years agoAdded a separate databa cleanup script.
Nik Okuntseff [Sun, 12 Jun 2016 16:49:09 +0000 (16:49 +0000)]
Added a separate databa cleanup script.

7 years agoFixed issue #4 - copy-paste error in fillDropdowns().
Nik Okuntseff [Mon, 6 Jun 2016 15:11:22 +0000 (15:11 +0000)]
Fixed issue #4 - copy-paste error in fillDropdowns().

8 years agoAdded a redirect back to profile after monthly quota is saved.
Anže Videnič [Tue, 24 May 2016 07:17:09 +0000 (09:17 +0200)]
Added a redirect back to profile after monthly quota is saved.

8 years agoMerges an updated upstream from main.
Anže Videnič [Tue, 24 May 2016 06:49:13 +0000 (08:49 +0200)]
Merges an updated upstream from main.

8 years agoAdded plugin where users monthly quota can be set and tracked by users.
Anže Videnič [Mon, 23 May 2016 14:52:09 +0000 (16:52 +0200)]
Added plugin where users monthly quota can be set and tracked by users.

8 years agoRemoved no longer needed comments in the Finnish translation file.
Nik Okuntseff [Sat, 21 May 2016 19:18:55 +0000 (19:18 +0000)]
Removed no longer needed comments in the Finnish translation file.

8 years agoMerge pull request #2 from rkv/patch-1
anuko [Sat, 21 May 2016 18:55:53 +0000 (18:55 +0000)]
Merge pull request #2 from rkv/patch-1

Update fi.lang.php

8 years agoUpdate fi.lang.php
rkv [Fri, 20 May 2016 19:47:07 +0000 (22:47 +0300)]
Update fi.lang.php

Translations added and changed

8 years agoDutch translation improved.
Nik Okuntseff [Tue, 19 Apr 2016 14:37:34 +0000 (14:37 +0000)]
Dutch translation improved.

8 years agoA simple change to test a push.
Nik Okuntseff [Fri, 8 Apr 2016 18:53:16 +0000 (18:53 +0000)]
A simple change to test a push.

8 years agoMerge branch 'refactoring_test' - this is really a test.
Nik Okuntseff [Thu, 7 Apr 2016 20:15:46 +0000 (20:15 +0000)]
Merge branch 'refactoring_test' - this is really a test.

8 years agoTesting branches and merges.
Nik Okuntseff [Thu, 7 Apr 2016 20:12:53 +0000 (20:12 +0000)]
Testing branches and merges.

8 years agoSimple change for testing merges.
Nik Okuntseff [Thu, 7 Apr 2016 20:08:56 +0000 (20:08 +0000)]
Simple change for testing merges.

8 years agoCosmetic - testing basic branching and merges.
Nik Okuntseff [Thu, 7 Apr 2016 20:03:54 +0000 (20:03 +0000)]
Cosmetic - testing basic branching and merges.

8 years agoRefactored time_to_decimal for clarity.
Nik Okuntseff [Wed, 6 Apr 2016 18:16:48 +0000 (18:16 +0000)]
Refactored time_to_decimal for clarity.

8 years agoFix report exports to honor user decimal mark designation.
Nik Okuntseff [Wed, 6 Apr 2016 17:04:08 +0000 (17:04 +0000)]
Fix report exports to honor user decimal mark designation.

8 years agoCosmetic change to test easier git push.
Nik Okuntseff [Tue, 5 Apr 2016 23:54:05 +0000 (23:54 +0000)]
Cosmetic change to test easier git push.

8 years agoTesting another commit to see what's wrong with github.
Nik Okuntseff [Tue, 5 Apr 2016 21:44:29 +0000 (21:44 +0000)]
Testing another commit to see what's wrong with github.

8 years agoCosmetic improvements to pt-br file.
Nik Okuntseff [Tue, 5 Apr 2016 21:22:23 +0000 (21:22 +0000)]
Cosmetic improvements to pt-br file.

8 years agoFixed a typo in pt-br file.
Nik Okuntseff [Tue, 5 Apr 2016 19:22:32 +0000 (19:22 +0000)]
Fixed a typo in pt-br file.

8 years agoFixed pt-br file.
Nik Okuntseff [Tue, 5 Apr 2016 18:19:58 +0000 (18:19 +0000)]
Fixed pt-br file.

8 years agopt-br translation improved.
Nik Okuntseff [Tue, 5 Apr 2016 18:11:12 +0000 (18:11 +0000)]
pt-br translation improved.

8 years agopt-br translation improved.
Nik Okuntseff [Tue, 5 Apr 2016 17:22:08 +0000 (17:22 +0000)]
pt-br translation improved.

8 years agoImproved browser language determination.
Nik Okuntseff [Tue, 5 Apr 2016 16:16:02 +0000 (16:16 +0000)]
Improved browser language determination.

8 years agoCleanup in translation files.
Nik Okuntseff [Tue, 5 Apr 2016 14:33:11 +0000 (14:33 +0000)]
Cleanup in translation files.

8 years agoCleanup in translation files.
Nik Okuntseff [Tue, 5 Apr 2016 13:57:51 +0000 (13:57 +0000)]
Cleanup in translation files.

8 years agoImproved detection of browser language.
Nik Okuntseff [Tue, 5 Apr 2016 13:23:53 +0000 (13:23 +0000)]
Improved detection of browser language.

Improved efficiency by not going through file system again.

8 years agoAdded clarifying comments.
Nik Okuntseff [Tue, 5 Apr 2016 12:58:47 +0000 (12:58 +0000)]
Added clarifying comments.

8 years agoFixed determination of a multi-part browser language such as pt-br.
Nik Okuntseff [Tue, 5 Apr 2016 03:41:05 +0000 (03:41 +0000)]
Fixed determination of a multi-part browser language such as pt-br.

8 years agopt-br translation improved.
Nik Okuntseff [Tue, 5 Apr 2016 00:01:10 +0000 (00:01 +0000)]
pt-br translation improved.

8 years agoImproved pt-br translation.
Nik Okuntseff [Mon, 4 Apr 2016 21:48:30 +0000 (21:48 +0000)]
Improved pt-br translation.

8 years agopt-br translation slightly improved.
Nik Okuntseff [Mon, 4 Apr 2016 20:21:03 +0000 (20:21 +0000)]
pt-br translation slightly improved.

8 years agopt-br translation slightly improved.
Nik Okuntseff [Mon, 4 Apr 2016 19:32:48 +0000 (19:32 +0000)]
pt-br translation slightly improved.

8 years agopt-br translation added (very incomplete)
Nik Okuntseff [Mon, 4 Apr 2016 19:00:26 +0000 (19:00 +0000)]
pt-br translation added (very incomplete)

Work in still in progress to see if we can reuse strings in the end of the file.

8 years agoUpdate README.md
anuko [Sun, 3 Apr 2016 23:10:33 +0000 (23:10 +0000)]
Update README.md

8 years agoUpdate README.md
anuko [Sun, 3 Apr 2016 22:53:28 +0000 (22:53 +0000)]
Update README.md

8 years agoRefactoring - white space.
Nik Okuntseff [Sun, 3 Apr 2016 14:14:54 +0000 (14:14 +0000)]
Refactoring - white space.

8 years agoChanged a redirect for the Locking plugin.
Nik Okuntseff [Sun, 3 Apr 2016 13:36:04 +0000 (13:36 +0000)]
Changed a redirect for the Locking plugin.

8 years agoRemoving legacy lock interval in days - replaced by Locking plugin.
Nik Okuntseff [Sat, 2 Apr 2016 16:14:05 +0000 (16:14 +0000)]
Removing legacy lock interval in days - replaced by Locking plugin.

8 years agoCleanup - whitespace.
Nik Okuntseff [Sat, 2 Apr 2016 15:48:09 +0000 (15:48 +0000)]
Cleanup - whitespace.

8 years agoCleaning up - white space.
Nik Okuntseff [Sat, 2 Apr 2016 14:59:25 +0000 (14:59 +0000)]
Cleaning up - white space.

8 years agoIncomplete Icelandic translation removed.
Nik Okuntseff [Sat, 2 Apr 2016 12:21:04 +0000 (12:21 +0000)]
Incomplete Icelandic translation removed.

The existing Icelandic translation contains a very small number of strings.
Removing from distro.

8 years agoCosmetic white space cleanup.
Nik Okuntseff [Sat, 2 Apr 2016 01:47:26 +0000 (01:47 +0000)]
Cosmetic white space cleanup.

8 years agoSome cleanup in localization files.
Nik Okuntseff [Sat, 2 Apr 2016 01:33:46 +0000 (01:33 +0000)]
Some cleanup in localization files.

8 years agoSome refactoring in translation files.
Nik Okuntseff [Fri, 1 Apr 2016 23:25:39 +0000 (23:25 +0000)]
Some refactoring in translation files.

8 years agoChanged a message after a date locking error.
Nik Okuntseff [Fri, 1 Apr 2016 23:08:11 +0000 (23:08 +0000)]
Changed a message after a date locking error.

8 years agoFixed export and import for locking specification.
Nik Okuntseff [Fri, 1 Apr 2016 18:23:40 +0000 (18:23 +0000)]
Fixed export and import for locking specification.

8 years agoAdded an override for managers to the Locking plugin.
Nik Okuntseff [Fri, 1 Apr 2016 17:21:03 +0000 (17:21 +0000)]
Added an override for managers to the Locking plugin.

8 years agoExtended the Locking plugin with cron specification fo locks.
Nik Okuntseff [Fri, 1 Apr 2016 16:56:58 +0000 (16:56 +0000)]
Extended the Locking plugin with cron specification fo locks.

8 years agoFixed usage of isDateLocked()
Nik Okuntseff [Thu, 31 Mar 2016 20:57:01 +0000 (20:57 +0000)]
Fixed usage of isDateLocked()

8 years agoAdded a TODO comment for the Serbian file.
Nik Okuntseff [Thu, 31 Mar 2016 18:58:15 +0000 (18:58 +0000)]
Added a TODO comment for the Serbian file.

8 years agoSerbian translation improved.
Nik Okuntseff [Thu, 31 Mar 2016 18:48:50 +0000 (18:48 +0000)]
Serbian translation improved.

8 years agoImplemented locking feature as an optionally enabled plugin.
Nik Okuntseff [Thu, 31 Mar 2016 18:31:28 +0000 (18:31 +0000)]
Implemented locking feature as an optionally enabled plugin.

8 years agoRefactoring - cleaned up white space.
Nik Okuntseff [Wed, 30 Mar 2016 19:21:19 +0000 (19:21 +0000)]
Refactoring - cleaned up white space.

8 years agoRefactoring, finished replacing with ttUser::isPluginEnabled().
Nik Okuntseff [Wed, 30 Mar 2016 19:09:24 +0000 (19:09 +0000)]
Refactoring, finished replacing with ttUser::isPluginEnabled().

8 years agoRefactoring - more usage of ttUser::isPluginEnabled().
Nik Okuntseff [Wed, 30 Mar 2016 18:59:22 +0000 (18:59 +0000)]
Refactoring - more usage of ttUser::isPluginEnabled().

8 years agoWork in progress switching to ttUser::isPluginEnabled().
Nik Okuntseff [Wed, 30 Mar 2016 16:59:35 +0000 (16:59 +0000)]
Work in progress switching to ttUser::isPluginEnabled().

8 years agoWork in progress switching to ttUser::isPluginEnabled().
Nik Okuntseff [Wed, 30 Mar 2016 16:44:47 +0000 (16:44 +0000)]
Work in progress switching to ttUser::isPluginEnabled().

8 years agoWrote ttUser::isPluginEnabled() function.
Nik Okuntseff [Wed, 30 Mar 2016 16:32:40 +0000 (16:32 +0000)]
Wrote ttUser::isPluginEnabled() function.

8 years agoRefactoring - using ttPluginEnabled.
Nik Okuntseff [Wed, 30 Mar 2016 16:11:57 +0000 (16:11 +0000)]
Refactoring - using ttPluginEnabled.

8 years agoWrote ttPluginEnabled() function.
Nik Okuntseff [Wed, 30 Mar 2016 15:32:42 +0000 (15:32 +0000)]
Wrote ttPluginEnabled() function.

8 years agoRefactoring - cleaning up white space.
Nik Okuntseff [Wed, 30 Mar 2016 04:07:14 +0000 (04:07 +0000)]
Refactoring - cleaning up white space.

8 years agoSerbian translation improved.
Nik Okuntseff [Tue, 29 Mar 2016 20:38:51 +0000 (20:38 +0000)]
Serbian translation improved.

8 years agoSerbian translation improved.
Nik Okuntseff [Tue, 29 Mar 2016 14:57:33 +0000 (14:57 +0000)]
Serbian translation improved.

8 years agoCleaning up white space.
Nik Okuntseff [Tue, 29 Mar 2016 03:31:38 +0000 (03:31 +0000)]
Cleaning up white space.

8 years agoRefactoring a bit.
Nik Okuntseff [Tue, 29 Mar 2016 02:03:51 +0000 (02:03 +0000)]
Refactoring a bit.

8 years agoRefactoring white space.
Nik Okuntseff [Tue, 29 Mar 2016 01:50:25 +0000 (01:50 +0000)]
Refactoring white space.

8 years agoRefactoring - reorganized code a bit for clarity.
Nik Okuntseff [Tue, 29 Mar 2016 01:41:38 +0000 (01:41 +0000)]
Refactoring - reorganized code a bit for clarity.

8 years agoFixed a condition. Also some white space cleanup.
Nik Okuntseff [Mon, 28 Mar 2016 23:44:39 +0000 (23:44 +0000)]
Fixed a condition. Also some white space cleanup.

8 years agoReorganized code a bit for clarity.
Nik Okuntseff [Mon, 28 Mar 2016 20:53:48 +0000 (20:53 +0000)]
Reorganized code a bit for clarity.

8 years agoCleaning up white space.
Nik Okuntseff [Mon, 28 Mar 2016 20:46:56 +0000 (20:46 +0000)]
Cleaning up white space.

8 years agoReorganized code a bit.
Nik Okuntseff [Mon, 28 Mar 2016 17:01:42 +0000 (17:01 +0000)]
Reorganized code a bit.

8 years agoRefactoring white space.
Nik Okuntseff [Mon, 28 Mar 2016 16:55:49 +0000 (16:55 +0000)]
Refactoring white space.

8 years agoRefactoring, reorganized code a bit
Nik Okuntseff [Mon, 28 Mar 2016 16:27:17 +0000 (16:27 +0000)]
Refactoring, reorganized code a bit

8 years agoRefactoring whate space
Nik Okuntseff [Mon, 28 Mar 2016 16:19:12 +0000 (16:19 +0000)]
Refactoring whate space

8 years agoReplacing else if with elseif
Nik Okuntseff [Mon, 28 Mar 2016 14:48:59 +0000 (14:48 +0000)]
Replacing else if with elseif

8 years agoRemoved commented code
Nik Okuntseff [Mon, 28 Mar 2016 13:39:44 +0000 (13:39 +0000)]
Removed commented code

8 years agoAdded special auth handling for admin@localhost.
Nik Okuntseff [Sat, 26 Mar 2016 19:38:47 +0000 (19:38 +0000)]
Added special auth handling for admin@localhost.

This could be useful for LDAP installs where admin account
does not exist in LDAP directory or is misconfigured.

8 years agoFixed a redirect for different user roles after password change.
Nik Okuntseff [Fri, 25 Mar 2016 17:33:37 +0000 (10:33 -0700)]
Fixed a redirect for different user roles after password change.

8 years agoAdded an option to change admin login, name, and email.
Nik Okuntseff [Fri, 25 Mar 2016 16:59:24 +0000 (09:59 -0700)]
Added an option to change admin login, name, and email.

8 years agoMinor improvements in the Serbian file
Nik Okuntseff [Thu, 24 Mar 2016 22:59:12 +0000 (15:59 -0700)]
Minor improvements in the Serbian file

8 years agoAdded Serbian translation
Nik Okuntseff [Thu, 24 Mar 2016 21:05:25 +0000 (14:05 -0700)]
Added Serbian translation

Translation provided by Laslo Sili

8 years agoRefactoring white space
Nik Okuntseff [Thu, 24 Mar 2016 01:48:14 +0000 (18:48 -0700)]
Refactoring white space

8 years agoRefactoring white space
Nik Okuntseff [Thu, 24 Mar 2016 01:40:21 +0000 (18:40 -0700)]
Refactoring white space