[commits] Horde-Hatchery branch master updated. 107285201f27fc45c4e12983e90e65426e4d597d

[Michael Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 9720fb85a152dc60efd14b1894ac57a45d9f1ce1

0a68cf3 Revert "Correctly fix listTimeObjects handling in the ajax interface."
fe6043d Revert "Fix variable name."
86202d6 Revert "Avoid key collisions when a listTimeObjects provider can export the same timeObject category"
1072852 Much better way of preventing timeObject category collisions.

-----------------------------------------------------------------------

commit 0a68cf3f07b725d4e38cde80493337f6aeb3b35b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sat Nov 7 12:08:26 2009 -0500

    Revert "Correctly fix listTimeObjects handling in the ajax interface."
    
    This reverts commit 2f91b86615afbf53897abd9e62c640335262952d.

 kronolith/js/kronolith.js |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-hatchery&r1=2f91b86615afbf53897abd9e62c640335262952d&r2=0a68cf3f07b725d4e38cde80493337f6aeb3b35b

-----------------------------------------------------------------------

commit fe6043d45ef5775e83cfe6ad6fdeb08b0dd38240
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sat Nov 7 12:08:54 2009 -0500

    Revert "Fix variable name."
    
    This reverts commit e88fef34e2fb50ac3b3588a5e1288d0b8f509bc7.

 kronolith/js/kronolith.js |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-hatchery&r1=0a68cf3f07b725d4e38cde80493337f6aeb3b35b&r2=fe6043d45ef5775e83cfe6ad6fdeb08b0dd38240

-----------------------------------------------------------------------

commit 86202d64f03b360a7eddc2af029ab238f5e6d675
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sat Nov 7 12:09:26 2009 -0500

    Revert "Avoid key collisions when a listTimeObjects provider can export the same timeObject category"
    
    This reverts commit 202eb693c2a77b366c59528044707adefde92564.

 kronolith/js/kronolith.js |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-hatchery&r1=fe6043d45ef5775e83cfe6ad6fdeb08b0dd38240&r2=86202d64f03b360a7eddc2af029ab238f5e6d675

-----------------------------------------------------------------------

commit 107285201f27fc45c4e12983e90e65426e4d597d
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Sat Nov 7 12:35:53 2009 -0500

    Much better way of preventing timeObject category collisions.
    
    Now, the display code will have to be tweaked though, since this results
    in a new section to be added for each subgroup. (Example, all birthdays
    are grouped together under Contacts, then a second Contacts group is
    added for all anniversaries...

 kronolith/js/kronolith.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-hatchery&r1=86202d64f03b360a7eddc2af029ab238f5e6d675&r2=107285201f27fc45c4e12983e90e65426e4d597d