[commits] Horde branch horde_5_2 updated. 88bfcbe2cfbb7db9f9cc9a3c3ddb781f0812a7b7
Michael J. Rubinsky
mrubinsk at horde.org
Tue Nov 26 19:59:27 UTC 2013
The branch "horde_5_2" has been updated.
The following is a summary of the commits.
from: 74c719379d20acc9451bc6764e13dc909e15e256
b771a0a Fix editing/deleting hermes deliverables via ajax.
abc63dd Simplify
db831cf Not used.
bac2520 Some timer improvements.
e84529e Tweak timer css.
b0143a9 Show the timer title in the log dialog.
ce17f42 Normalize some property names.
7d17197 Need to clone the node, or it moves it.
320bbcd Fade the correct node.
b499890 Simplify getting timer hash values.
5b11b0a Use global.
b96f327 Better button text.
7006ff9 Fix property name, phpdoc.
205f566 CHANGES
a871114 Bold the timer title.
8990311 No need to quote all these json property names.
0addbdb Default to current date in time form when stopping a timer.
64352ad No quote needed.
5064b96 Implement exclusive/non-exclusive timers.
9895426 Changes
e857bf8 Remove debug output.
88bfcbe Merge branch 'master' into horde_5_2
Summary: http://github.com/horde/horde/compare/74c719379d20acc9451bc6764e13dc909e15e256...88bfcbe2cfbb7db9f9cc9a3c3ddb781f0812a7b7
-----------------------------------------------------------------------
commit b771a0aa81ac4638111cccc745289e1d1864f487
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 24 00:06:49 2013 -0500
Fix editing/deleting hermes deliverables via ajax.
hermes/lib/Ajax/Application/Handler.php | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/b771a0aa81ac4638111cccc745289e1d1864f487
http://git.horde.org/horde-git/-/commit/b771a0aa81ac4638111cccc745289e1d1864f487
-----------------------------------------------------------------------
commit abc63dddb183fe509681dd78c4a00a0dd5ef4afc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 24 16:36:34 2013 -0500
Simplify
hermes/js/hermes.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/abc63dddb183fe509681dd78c4a00a0dd5ef4afc
http://git.horde.org/horde-git/-/commit/abc63dddb183fe509681dd78c4a00a0dd5ef4afc
-----------------------------------------------------------------------
commit db831cf1bd014a055247634c4a80d4d5a4159471
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 24 16:39:49 2013 -0500
Not used.
hermes/js/hermes.js | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
http://github.com/horde/horde/commit/db831cf1bd014a055247634c4a80d4d5a4159471
http://git.horde.org/horde-git/-/commit/db831cf1bd014a055247634c4a80d4d5a4159471
-----------------------------------------------------------------------
commit bac25204d6de4ea083d2adc01c0f966e87f97225
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 10:52:02 2013 -0500
Some timer improvements.
* Add ability to add Client/Cost Object/Job Type when creating timer.
* When stoping timer, if Client/CostObject/JobType is present, pre-fill
and lock the corresponding time entry fields.
* When stoping timer, give chance to either delete or keep the timer,
giving the ability to quickly log time for different tasks for the
same client/cost object combination.
hermes/js/hermes.js | 112 +++++++++++++++++++++++++-----
hermes/lib/Ajax/Application/Handler.php | 26 ++++++-
hermes/lib/Hermes.php | 11 +++-
hermes/templates/dynamic/timer.inc | 27 +++++++-
hermes/themes/default/dynamic/screen.css | 11 +++
5 files changed, 164 insertions(+), 23 deletions(-)
http://github.com/horde/horde/commit/bac25204d6de4ea083d2adc01c0f966e87f97225
http://git.horde.org/horde-git/-/commit/bac25204d6de4ea083d2adc01c0f966e87f97225
-----------------------------------------------------------------------
commit e84529e59fa11e7b5120e98818a04aa1f1d5f670
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 11:30:20 2013 -0500
Tweak timer css.
hermes/themes/default/dynamic/screen.css | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/e84529e59fa11e7b5120e98818a04aa1f1d5f670
http://git.horde.org/horde-git/-/commit/e84529e59fa11e7b5120e98818a04aa1f1d5f670
-----------------------------------------------------------------------
commit b0143a995d9c7b8563f9588128972dbc8c66f03b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 11:35:55 2013 -0500
Show the timer title in the log dialog.
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/b0143a995d9c7b8563f9588128972dbc8c66f03b
http://git.horde.org/horde-git/-/commit/b0143a995d9c7b8563f9588128972dbc8c66f03b
-----------------------------------------------------------------------
commit ce17f42ddb5dc40d7c459d3b8ad69572a6d5dcb0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:02:20 2013 -0500
Normalize some property names.
hermes/js/hermes.js | 10 +++++-----
hermes/lib/Ajax/Application/Handler.php | 2 +-
hermes/lib/Application.php | 4 ++--
hermes/lib/Hermes.php | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
http://github.com/horde/horde/commit/ce17f42ddb5dc40d7c459d3b8ad69572a6d5dcb0
http://git.horde.org/horde-git/-/commit/ce17f42ddb5dc40d7c459d3b8ad69572a6d5dcb0
-----------------------------------------------------------------------
commit 7d171977902861c5767abdfdcfe44b00c9c066e0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:02:48 2013 -0500
Need to clone the node, or it moves it.
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/7d171977902861c5767abdfdcfe44b00c9c066e0
http://git.horde.org/horde-git/-/commit/7d171977902861c5767abdfdcfe44b00c9c066e0
-----------------------------------------------------------------------
commit 320bbcd32d78a86914280e50f01a76d7baa2bf47
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:03:05 2013 -0500
Fade the correct node.
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/320bbcd32d78a86914280e50f01a76d7baa2bf47
http://git.horde.org/horde-git/-/commit/320bbcd32d78a86914280e50f01a76d7baa2bf47
-----------------------------------------------------------------------
commit b499890e86cd24b811307da8062e062eae9d90dd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:03:41 2013 -0500
Simplify getting timer hash values.
hermes/lib/Ajax/Application/Handler.php | 5 +----
hermes/lib/Hermes.php | 15 +++++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
http://github.com/horde/horde/commit/b499890e86cd24b811307da8062e062eae9d90dd
http://git.horde.org/horde-git/-/commit/b499890e86cd24b811307da8062e062eae9d90dd
-----------------------------------------------------------------------
commit 5b11b0a3f4d42fa99ee037f711c542191398d6bd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:04:07 2013 -0500
Use global.
hermes/lib/Ajax/Application/Handler.php | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/5b11b0a3f4d42fa99ee037f711c542191398d6bd
http://git.horde.org/horde-git/-/commit/5b11b0a3f4d42fa99ee037f711c542191398d6bd
-----------------------------------------------------------------------
commit b96f32738a02cf0b65f893d63a377f6a5cd47372
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:04:19 2013 -0500
Better button text.
hermes/templates/dynamic/timer.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/b96f32738a02cf0b65f893d63a377f6a5cd47372
http://git.horde.org/horde-git/-/commit/b96f32738a02cf0b65f893d63a377f6a5cd47372
-----------------------------------------------------------------------
commit 7006ff997bb565b47663061e35bd708056a9ab90
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:08:40 2013 -0500
Fix property name, phpdoc.
hermes/lib/Hermes.php | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/7006ff997bb565b47663061e35bd708056a9ab90
http://git.horde.org/horde-git/-/commit/7006ff997bb565b47663061e35bd708056a9ab90
-----------------------------------------------------------------------
commit 205f5661ba36798fdec51f50adaad8da5815f5c8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:11:29 2013 -0500
CHANGES
hermes/docs/CHANGES | 2 ++
hermes/package.xml | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/205f5661ba36798fdec51f50adaad8da5815f5c8
http://git.horde.org/horde-git/-/commit/205f5661ba36798fdec51f50adaad8da5815f5c8
-----------------------------------------------------------------------
commit a871114124ad8b2f587eedf1c5336575d207bff0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:19:12 2013 -0500
Bold the timer title.
hermes/js/hermes.js | 2 +-
hermes/themes/default/dynamic/screen.css | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/a871114124ad8b2f587eedf1c5336575d207bff0
http://git.horde.org/horde-git/-/commit/a871114124ad8b2f587eedf1c5336575d207bff0
-----------------------------------------------------------------------
commit 899031149e77828a456de3b6b6c91db5d9bd98fb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:24:30 2013 -0500
No need to quote all these json property names.
hermes/js/hermes.js | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
http://github.com/horde/horde/commit/899031149e77828a456de3b6b6c91db5d9bd98fb
http://git.horde.org/horde-git/-/commit/899031149e77828a456de3b6b6c91db5d9bd98fb
-----------------------------------------------------------------------
commit 0addbdbeb76e46337b40a2761662b44a77f4b76f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 13:26:42 2013 -0500
Default to current date in time form when stopping a timer.
hermes/js/hermes.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/0addbdbeb76e46337b40a2761662b44a77f4b76f
http://git.horde.org/horde-git/-/commit/0addbdbeb76e46337b40a2761662b44a77f4b76f
-----------------------------------------------------------------------
commit 64352ad41bacdd63e62cb08e2786e6957bac731d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 14:51:51 2013 -0500
No quote needed.
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/64352ad41bacdd63e62cb08e2786e6957bac731d
http://git.horde.org/horde-git/-/commit/64352ad41bacdd63e62cb08e2786e6957bac731d
-----------------------------------------------------------------------
commit 5064b9624dd98bacc38587679cff7df92db7567a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 14:53:13 2013 -0500
Implement exclusive/non-exclusive timers.
Request: 12543
hermes/js/hermes.js | 14 +++++-
hermes/lib/Ajax/Application/Handler.php | 21 +++------
hermes/lib/Hermes.php | 70 ++++++++++++++++++++++-------
hermes/templates/dynamic/timer.inc | 7 +++
hermes/themes/default/dynamic/screen.css | 9 +++-
5 files changed, 87 insertions(+), 34 deletions(-)
http://github.com/horde/horde/commit/5064b9624dd98bacc38587679cff7df92db7567a
http://git.horde.org/horde-git/-/commit/5064b9624dd98bacc38587679cff7df92db7567a
-----------------------------------------------------------------------
commit 98954261706d51e94c2868c2da85f055247af35f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 14:54:52 2013 -0500
Changes
hermes/docs/CHANGES | 1 +
hermes/package.xml | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/98954261706d51e94c2868c2da85f055247af35f
http://git.horde.org/horde-git/-/commit/98954261706d51e94c2868c2da85f055247af35f
-----------------------------------------------------------------------
commit e857bf8f6167eb18ccf025cfafe8a78839d6ed23
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 14:55:15 2013 -0500
Remove debug output.
hermes/js/hermes.js | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/e857bf8f6167eb18ccf025cfafe8a78839d6ed23
http://git.horde.org/horde-git/-/commit/e857bf8f6167eb18ccf025cfafe8a78839d6ed23
-----------------------------------------------------------------------
commit 88bfcbe2cfbb7db9f9cc9a3c3ddb781f0812a7b7
Merge: 74c7193 e857bf8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Nov 26 14:59:20 2013 -0500
Merge branch 'master' into horde_5_2
hermes/docs/CHANGES | 3 +
hermes/js/hermes.js | 171 ++++++++++++++++++++++--------
hermes/lib/Ajax/Application/Handler.php | 58 ++++++----
hermes/lib/Application.php | 4 +-
hermes/lib/Hermes.php | 100 ++++++++++++++----
hermes/package.xml | 11 ++-
hermes/templates/dynamic/timer.inc | 34 ++++++-
hermes/themes/default/dynamic/screen.css | 30 +++++-
8 files changed, 317 insertions(+), 94 deletions(-)
http://github.com/horde/horde/commit/88bfcbe2cfbb7db9f9cc9a3c3ddb781f0812a7b7
http://git.horde.org/horde-git/-/commit/88bfcbe2cfbb7db9f9cc9a3c3ddb781f0812a7b7
More information about the commits
mailing list