[commits] Horde branch master updated. a54a4981eec3a1708ff4a2e852677962441c1678

[Michael Rubinsky]

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

from: 73199bbd7861b06c7fd05887673ae341759206ec

0f098e7 [ansel] Fix getting url for images from the API
4a19b00 Rename init() to reset() and implement a new init() method that actually initializes the object
2675b5c Better way of loading and initializing the tag autocompleter.
270e95e Don't show edit icon for external calendars either.
cfd7bed Fix incorrect conlfict resolution
87b562b Calling reset() now automatically calls init() if the object is not initialized.
d45b8f7 revert another incorrect conflict resolution
a54a498 simplify tag ac initialization/resetting

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

commit 0f098e720bdbb9871280dbca5a7760bcf35e9a22
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 10:44:44 2010 -0500

    [ansel] Fix getting url for images from the API

 ansel/lib/Api.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/ansel/lib/Api.php?rt=horde-git&r1=e9bd13ca26c027fe3ee2eca3566b3c9c82fd8756&r2=0f098e720bdbb9871280dbca5a7760bcf35e9a22

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

commit 4a19b00ae54826975737f4e484084168bf658c35
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 11:24:40 2010 -0500

    Rename init() to reset() and implement a new init() method that actually initializes the object

 horde/js/prettyautocomplete.js |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/horde/js/prettyautocomplete.js?rt=horde-git&r1=86e8c1753fc05b342ed7113ee590149c0145579c&r2=4a19b00ae54826975737f4e484084168bf658c35

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

commit 2675b5cdc4012d1d667eeedee5a7d648bfa95b3e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 11:32:47 2010 -0500

    Better way of loading and initializing the tag autocompleter.
    
    Avoids issues with execution timing, dom loading etc...

 kronolith/index.php                           |   18 ++++++++++++-
 kronolith/js/kronolith.js                     |   33 +++++++++++++++++-------
 kronolith/lib/Ajax/Imple/TagAutoCompleter.php |    4 +++
 kronolith/templates/chunks/calendar.php       |    9 -------
 4 files changed, 43 insertions(+), 21 deletions(-)

http://git.horde.org/diff.php/kronolith/index.php?rt=horde-git&r1=c21e43baaef2fee2c48f449d45bedbbce6048fa1&r2=2675b5cdc4012d1d667eeedee5a7d648bfa95b3e
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=73199bbd7861b06c7fd05887673ae341759206ec&r2=2675b5cdc4012d1d667eeedee5a7d648bfa95b3e
http://git.horde.org/diff.php/kronolith/lib/Ajax/Imple/TagAutoCompleter.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=2675b5cdc4012d1d667eeedee5a7d648bfa95b3e
http://git.horde.org/diff.php/kronolith/templates/chunks/calendar.php?rt=horde-git&r1=73199bbd7861b06c7fd05887673ae341759206ec&r2=2675b5cdc4012d1d667eeedee5a7d648bfa95b3e

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

commit 270e95e88f59d6bc245b8da2c8855cdd88b96eca
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 11:36:22 2010 -0500

    Don't show edit icon for external calendars either.

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

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=2675b5cdc4012d1d667eeedee5a7d648bfa95b3e&r2=270e95e88f59d6bc245b8da2c8855cdd88b96eca

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

commit cfd7bed91436a06d9883599e7fb4380c66c9f0f1
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 12:32:18 2010 -0500

    Fix incorrect conlfict resolution

 kronolith/js/kronolith.js |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=270e95e88f59d6bc245b8da2c8855cdd88b96eca&r2=cfd7bed91436a06d9883599e7fb4380c66c9f0f1

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

commit 87b562b29191c4cf84ad0913da453af1c8caba1e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 13:00:53 2010 -0500

    Calling reset() now automatically calls init() if the object is not initialized.
    
    Simplifies client code, plus add some checks to avoid doing work for nothing...

 horde/js/prettyautocomplete.js |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/horde/js/prettyautocomplete.js?rt=horde-git&r1=4a19b00ae54826975737f4e484084168bf658c35&r2=87b562b29191c4cf84ad0913da453af1c8caba1e

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

commit d45b8f75f4fc141beafc187061dacec46a99aa8f
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 13:04:28 2010 -0500

    revert another incorrect conflict resolution

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

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=cfd7bed91436a06d9883599e7fb4380c66c9f0f1&r2=d45b8f75f4fc141beafc187061dacec46a99aa8f

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

commit a54a4981eec3a1708ff4a2e852677962441c1678
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Mar 10 13:05:59 2010 -0500

    simplify tag ac initialization/resetting

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

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=d45b8f75f4fc141beafc187061dacec46a99aa8f&r2=a54a4981eec3a1708ff4a2e852677962441c1678