[commits] Horde branch H4-Jonah updated. 2a6760a484a70cd43f20e89b8013c253ea181791

Michael Rubinsky mike at theupstairsroom.com
Fri Jul 9 22:51:15 UTC 2010


The branch "H4-Jonah" has been updated.
The following is a summary of the commits.

from: 08e6f4becb287c1c4b292595210ede76e5b26cf3

89187d3 Move method.
adbdf21 Don't encrypt/decrypt empty messages.
135b2e0 This ini_set() doesn't work.
6afd0fd Fix turba short tags templates
5f6adf2 wish -> want
2163476 Description of file.
5914091 RB_confirm is too specific - add to RB_window instead
4b600ba Allow IMPDialog to handle simple Yes/No dialogs
034c899 Use IMPDialog for DIMP folder actions.
ed8c249 Make sure these entries are not confused for IMAP mailboxes
25e4e9f Bug #6832: Add confirm dialog when moving to notepad/tasklist
4bbf727 Replace short open tags.
ceeedd2 Revert "RB_confirm is too specific - add to RB_window instead"
801dedf MFB:
115879a MFB:
53d58bf Jump through a number of hoops to make sure we always get events for the time span that is already stored in the cache.
74db9af Load the timeobjects *after* correcting the start/end dates.
088b82b If we don't need authentication and have a target URL, redirect there.
7b56b34 Strip index.php from selfUrl().
586202d Don't request tags if we don't have any events.
df117aa fix parameter passing to Kronolith_Driver#listEvents
b960711 Only support basic auth at the moment, so use that if any auth is requested.
0e5db44 Make sure the Kronolith::getDriver() reloads the calendar parameters when re-using an existing Ical driver. Don't re-use the HTTP client if opening another calendar. Fix caching of error messages. Remote calendar user names are not encrypted.
e649acf Don't show errors before we've actually done anything.
dd51814 The only expected exception here would be a Horde_Exception_Not_Found.
3bd6cf6 More complete support for reccuring event exceptions when dealing with iCalendar files Bug: 9091
bf50044 changes
fcb3a7a Fix method name.
88ec9da These methods need to be public so the effect objects can see them.
38b46ab 2 more utility functions to Horde_Image
06b6ed9 add some missing methods to the Gd driver that some effects use.
08ee3a4 these don't return PEAR_Error
a33d303 get rid of remaining PEAR_Error in Horde_Image
f196ce5 add missing semi-colon.
d33c62c global scope
93510a9 Global scope
840e1c7 If default addressbook is not browsable, try one from the addressbook pref.
c793472 changes
8c00d6c need to ucfirst() the $app name when using it as a class name part.
ea099d3 Revert "need to ucfirst() the $app name when using it as a class name part."
898c917 Make use of the configspecial we have for contact sources.
ec12e44 Don't display HTML image options if HTML inline viewing is disabled
a6d02a9 Fix typo.
0d3074d Request #9129: Allow admin to define list of safe e-mail addresses that will not experience HTML image blocking
a78f693 Reuse existing code
d1c7051 Don't use Horde-specific app assumption in factory.
01be634 Emoticons filter fixes.
c099e5f avoid undefined index notices
90a9aa6 Handle iTip CANCEL request of a recurring event instance correctly.
82a3116 ADD is only used when adding new instances to an existing recurring event series.
376aa47 prune code that produced no effects.
7be850e Revert "prune code that produced no effects."
3dd61a3 Looks like this is probably what was intended.
fd150ae BFN
7c348a5 Was wondering why I had a 150px gap on every page
2d9e92a Simplify
05f2a53 I *think* we always want Horde::url() to use Horde webroot
bf04645 Output inline script when using dimp but displaying non-dimp content
f712baf simplify
4a32380 Merge branch 'master' into H4-Jonah
7ffd42a getAvailableTypes() should be in Jonah::
10e46cc no need for aggregate view
968d420 Use Horde_View for channel listing, remove needlessly complicated template rendering for channel views
2a6760a we still have composite channels

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

commit 89187d383d0ede48e7a6ec213243eb2d46a9f321
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 00:19:43 2010 +0200

    Move method.

 kronolith/lib/Driver/Ical.php |   52 ++++++++++++++++++++--------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

http://git.horde.org/diff.php/kronolith/lib/Driver/Ical.php?rt=horde-git&r1=94173fc3fb4b8efb716dffedbecabab49f147722&r2=89187d383d0ede48e7a6ec213243eb2d46a9f321

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

commit adbdf2167a21a091e69e3a14e553ea0d84b2f7ae
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 00:34:22 2010 +0200

    Don't encrypt/decrypt empty messages.

 framework/Secret/lib/Horde/Secret.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/Secret/lib/Horde/Secret.php?rt=horde-git&r1=3db5893ecb72a2f35b73ece266e26594b8045f78&r2=adbdf2167a21a091e69e3a14e553ea0d84b2f7ae

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

commit 135b2e087cb939ffc2c6c2e693a573c13bfdf492
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 18:52:40 2010 -0600

    This ini_set() doesn't work.

 framework/View/lib/Horde/View.php |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/View/lib/Horde/View.php?rt=horde-git&r1=29bba74db207a59ad3dc50da865551be953b26cc&r2=135b2e087cb939ffc2c6c2e693a573c13bfdf492

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

commit 6afd0fd29bd356acaf80feff1bf701da16710df8
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 18:53:02 2010 -0600

    Fix turba short tags templates

 turba/templates/search/advanced.html.php                 |   16 +++++++-------
 turba/templates/search/basic.html.php                    |   12 +++++-----
 turba/templates/search/duplicate.html.php                |   10 ++++----
 turba/templates/search/duplicate/contact_header.html.php |    8 +++---
 turba/templates/search/duplicate/list.html.php           |   12 +++++-----
 turba/templates/search/header.html.php                   |    4 +-
 turba/templates/search/vbook.html.php                    |    4 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

http://git.horde.org/diff.php/turba/templates/search/advanced.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8
http://git.horde.org/diff.php/turba/templates/search/basic.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8
http://git.horde.org/diff.php/turba/templates/search/duplicate.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8
http://git.horde.org/diff.php/turba/templates/search/duplicate/contact_header.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8
http://git.horde.org/diff.php/turba/templates/search/duplicate/list.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8
http://git.horde.org/diff.php/turba/templates/search/header.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8
http://git.horde.org/diff.php/turba/templates/search/vbook.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=6afd0fd29bd356acaf80feff1bf701da16710df8

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

commit 5f6adf20fe681b1d040cbaa824292993daae303d
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 19:02:56 2010 -0600

    wish -> want
    
    Wish connotes that something will hopefully happen.
    Want connotes that something will definitely happen.

 imp/attachment.php |    2 +-
 imp/message.php    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/imp/attachment.php?rt=horde-git&r1=1065ab77abdfe7b025e24dab33a2db9cbbea90ac&r2=5f6adf20fe681b1d040cbaa824292993daae303d
http://git.horde.org/diff.php/imp/message.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=5f6adf20fe681b1d040cbaa824292993daae303d

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

commit 21634763c35139063b7767bfaa8170ff52fe8591
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 19:18:34 2010 -0600

    Description of file.

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

http://git.horde.org/diff.php/horde/js/redbox.js?rt=horde-git&r1=4ff6763fddf80477f6e7d5c169bedf33cbf8e6ec&r2=21634763c35139063b7767bfaa8170ff52fe8591

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

commit 59140912dd17385553124964ec4c8d824fa753b2
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 21:53:12 2010 -0600

    RB_confirm is too specific - add to RB_window instead

 horde/themes/screen.css |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=daf7ac7c9af83e278d5110a4a07c3572dc69f3f4&r2=59140912dd17385553124964ec4c8d824fa753b2

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

commit 4b600ba8f7806b634cb6a0596e69839f5009f765
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 21:44:37 2010 -0600

    Allow IMPDialog to handle simple Yes/No dialogs
    
    Add a bit of IMPDialog documentation

 imp/js/dialog.js  |   46 +++++++++++++++++++++++++++++++++++++---------
 imp/js/mailbox.js |   31 ++++++++++++++++++++++---------
 imp/mailbox.php   |    1 +
 3 files changed, 60 insertions(+), 18 deletions(-)

http://git.horde.org/diff.php/imp/js/dialog.js?rt=horde-git&r1=1ed41f6721afe6cf43bd54c58ab8252d0346ac65&r2=4b600ba8f7806b634cb6a0596e69839f5009f765
http://git.horde.org/diff.php/imp/js/mailbox.js?rt=horde-git&r1=9c078bc25ad56f126dafab18d31b8bfc594fa44a&r2=4b600ba8f7806b634cb6a0596e69839f5009f765
http://git.horde.org/diff.php/imp/mailbox.php?rt=horde-git&r1=4f3bc19eac444e3d99b7e56b188bd9f99db3686d&r2=4b600ba8f7806b634cb6a0596e69839f5009f765

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

commit 034c899d59320b764bdcb750d2d1a3eaf0fb7af1
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 22:11:01 2010 -0600

    Use IMPDialog for DIMP folder actions.

 imp/js/dialog.js             |    3 +-
 imp/js/dimpbase.js           |   53 +++++++++++++++---------------------------
 imp/templates/dimp/index.inc |    9 -------
 3 files changed, 21 insertions(+), 44 deletions(-)

http://git.horde.org/diff.php/imp/js/dialog.js?rt=horde-git&r1=4b600ba8f7806b634cb6a0596e69839f5009f765&r2=034c899d59320b764bdcb750d2d1a3eaf0fb7af1
http://git.horde.org/diff.php/imp/js/dimpbase.js?rt=horde-git&r1=0217d059e2e1a8f9bab3193d863996ef5c80a7c7&r2=034c899d59320b764bdcb750d2d1a3eaf0fb7af1
http://git.horde.org/diff.php/imp/templates/dimp/index.inc?rt=horde-git&r1=befcebe74422f7fcf319745bc897ab3eb169b5f1&r2=034c899d59320b764bdcb750d2d1a3eaf0fb7af1

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

commit ed8c2492ceb46506afdeb99bf37c31463199bae4
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 22:53:51 2010 -0600

    Make sure these entries are not confused for IMAP mailboxes

 imp/lib/IMP.php     |    4 ++--
 imp/lib/Message.php |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

http://git.horde.org/diff.php/imp/lib/IMP.php?rt=horde-git&r1=bad88c7b12aa154a64de9471361a2f28fe1f684e&r2=ed8c2492ceb46506afdeb99bf37c31463199bae4
http://git.horde.org/diff.php/imp/lib/Message.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=ed8c2492ceb46506afdeb99bf37c31463199bae4

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

commit 25e4e9f441d22b3df2b6f6396ff8b4be3063695c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Jul 6 23:15:18 2010 -0600

    Bug #6832: Add confirm dialog when moving to notepad/tasklist

 imp/js/mailbox.js                     |   33 ++++++++++++++++++++++--------
 imp/js/message.js                     |   35 +++++++++++++++++++++++++-------
 imp/mailbox.php                       |    2 +-
 imp/message.php                       |    6 +++++
 imp/templates/imp/javascript_defs.php |    1 +
 5 files changed, 59 insertions(+), 18 deletions(-)

http://git.horde.org/diff.php/imp/js/mailbox.js?rt=horde-git&r1=4b600ba8f7806b634cb6a0596e69839f5009f765&r2=25e4e9f441d22b3df2b6f6396ff8b4be3063695c
http://git.horde.org/diff.php/imp/js/message.js?rt=horde-git&r1=4ff6763fddf80477f6e7d5c169bedf33cbf8e6ec&r2=25e4e9f441d22b3df2b6f6396ff8b4be3063695c
http://git.horde.org/diff.php/imp/mailbox.php?rt=horde-git&r1=4b600ba8f7806b634cb6a0596e69839f5009f765&r2=25e4e9f441d22b3df2b6f6396ff8b4be3063695c
http://git.horde.org/diff.php/imp/message.php?rt=horde-git&r1=5f6adf20fe681b1d040cbaa824292993daae303d&r2=25e4e9f441d22b3df2b6f6396ff8b4be3063695c
http://git.horde.org/diff.php/imp/templates/imp/javascript_defs.php?rt=horde-git&r1=9c078bc25ad56f126dafab18d31b8bfc594fa44a&r2=25e4e9f441d22b3df2b6f6396ff8b4be3063695c

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

commit 4bbf727346e035b9b76c0c605230a7aa951d390f
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 10:38:24 2010 +0200

    Replace short open tags.

 framework/View/lib/Horde/View/Helper/Benchmark.php |    4 +-
 framework/View/lib/Horde/View/Helper/Capture.php   |    8 +++---
 framework/View/lib/Horde/View/Helper/Text.php      |   14 +++++-----
 kronolith/templates/itip/notification.html.php     |   24 ++++++++++----------
 kronolith/templates/itip/notification.plain.php    |   14 +++++-----
 luxor/templates/directory.html.php                 |    4 +-
 luxor/templates/symbol.html.php                    |   16 ++++++------
 7 files changed, 42 insertions(+), 42 deletions(-)

http://git.horde.org/diff.php/framework/View/lib/Horde/View/Helper/Benchmark.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f
http://git.horde.org/diff.php/framework/View/lib/Horde/View/Helper/Capture.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f
http://git.horde.org/diff.php/framework/View/lib/Horde/View/Helper/Text.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f
http://git.horde.org/diff.php/kronolith/templates/itip/notification.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f
http://git.horde.org/diff.php/kronolith/templates/itip/notification.plain.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f
http://git.horde.org/diff.php/luxor/templates/directory.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f
http://git.horde.org/diff.php/luxor/templates/symbol.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4bbf727346e035b9b76c0c605230a7aa951d390f

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

commit ceeedd23fef69a32e2a943e47f98f6e83acaa9e0
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 11:19:24 2010 +0200

    Revert "RB_confirm is too specific - add to RB_window instead"
    
    There was a reason this was so specific. We already use forms in RB dialogs,
    e.g. in Kronolith, that we don't want to look like a confirm dialog.
    
    This reverts commit 59140912dd17385553124964ec4c8d824fa753b2.

 horde/themes/screen.css |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=59140912dd17385553124964ec4c8d824fa753b2&r2=ceeedd23fef69a32e2a943e47f98f6e83acaa9e0

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

commit 801dedfae0500439ef8490298367f4f32a05aecb
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Jul 7 09:31:20 2010 +0200

    MFB:
    
    Actually use the newer Freebusy handler.
    Merge several minor fixes from Git HEAD. Reactivated some tests.
    kolab/issue4257 (Always accept policy doesnt set atendee status to accepted)

 framework/Kolab_Filter/lib/Horde/Kolab/Resource.php               |  121 +----
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php         |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php      |   25 +-
 .../Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php      |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php |    2 +-
 5 files changed, 28 insertions(+), 124 deletions(-)

http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php?rt=horde-git&r1=ca6b51851fce63520490f0c5295db8a380d281bf&r2=801dedfae0500439ef8490298367f4f32a05aecb
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php?rt=horde-git&r1=2be282e64fc4519a6254ec721be3751cd42c7a2d&r2=801dedfae0500439ef8490298367f4f32a05aecb
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php?rt=horde-git&r1=9cb1db2414871d3c98a0ebed0d11288c84cb384f&r2=801dedfae0500439ef8490298367f4f32a05aecb
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=801dedfae0500439ef8490298367f4f32a05aecb
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php?rt=horde-git&r1=9cb1db2414871d3c98a0ebed0d11288c84cb384f&r2=801dedfae0500439ef8490298367f4f32a05aecb

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

commit 115879a777fa1cdd4c625d1a6539a4a6326ceb45
Author: Gunnar Wrobel <p at rdus.de>
Date:   Wed Jul 7 11:41:05 2010 +0200

    MFB:
    
    Split Kolab_Resource from Kolab_Filter.
    Complete separation between resource handling and the filter package.

 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Exception.php       |   72 -
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php        |   44 +
 .../Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php  |    4 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php  |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php  |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Resource.php               |  859 -----
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php         |  102 -
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php      |  162 -
 .../Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php      |  117 -
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php |   55 -
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Itip.php          |  257 --
 framework/Kolab_Resource/COPYING                                  |  504 +++
 framework/Kolab_Resource/lib/Horde/Kolab/Resource.php             |  812 ++++
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Epoch.php       |  102 +
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php   |   72 +
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy.php    |  162 +
 .../Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Kolab.php    |  117 +
 .../Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Mock.php     |   55 +
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Itip.php        |  257 ++
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php       |   90 +
 framework/Kolab_Resource/package.xml                              |  154 +
 .../test/Horde/Kolab/Resource/Integration/ResourceTest.php        |   41 +
 framework/Kolab_Resource/test/Horde/Kolab/Resource/TestCase.php   |   33 +
 framework/Kolab_Resource/test/Horde/Kolab/Resource/phpunit.xml    |    8 +
 24 files changed, 2455 insertions(+), 1628 deletions(-)
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Exception.php
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Resource.php
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php
 delete mode 100644 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Itip.php
 create mode 100644 framework/Kolab_Resource/COPYING
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Epoch.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Kolab.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Mock.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Itip.php
 create mode 100644 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php
 create mode 100644 framework/Kolab_Resource/package.xml
 create mode 100644 framework/Kolab_Resource/test/Horde/Kolab/Resource/Integration/ResourceTest.php
 create mode 100644 framework/Kolab_Resource/test/Horde/Kolab/Resource/TestCase.php
 create mode 100644 framework/Kolab_Resource/test/Horde/Kolab/Resource/phpunit.xml

http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Exception.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php?rt=horde-git&r1=917493ab75dbc9730c59808ca8428e8843bbb264&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php?rt=horde-git&r1=da4c5687690883de5668a2ce8bb7b279a815b6d1&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php?rt=horde-git&r1=da4c5687690883de5668a2ce8bb7b279a815b6d1&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php?rt=horde-git&r1=801dedfae0500439ef8490298367f4f32a05aecb&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php?rt=horde-git&r1=801dedfae0500439ef8490298367f4f32a05aecb&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php?rt=horde-git&r1=801dedfae0500439ef8490298367f4f32a05aecb&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php?rt=horde-git&r1=801dedfae0500439ef8490298367f4f32a05aecb&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php?rt=horde-git&r1=801dedfae0500439ef8490298367f4f32a05aecb&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Itip.php?rt=horde-git&r1=2be282e64fc4519a6254ec721be3751cd42c7a2d&r2=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/COPYING?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Epoch.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Kolab.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Mock.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Itip.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/package.xml?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/test/Horde/Kolab/Resource/Integration/ResourceTest.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/test/Horde/Kolab/Resource/TestCase.php?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45
http://git.horde.org/co.php/framework/Kolab_Resource/test/Horde/Kolab/Resource/phpunit.xml?rt=horde-git&r=115879a777fa1cdd4c625d1a6539a4a6326ceb45

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

commit 53d58bff90bb3286b2f61d13014ed436f71a9a41
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 15:35:06 2010 +0200

    Jump through a number of hoops to make sure we always get events for the time span that is already stored in the cache.

 kronolith/js/kronolith.js          |  133 +++++++++++++++++++++++-------------
 kronolith/lib/Ajax/Application.php |   19 +++--
 2 files changed, 95 insertions(+), 57 deletions(-)

http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=6073b5600a3b4f4edd73aad636e28c6a21d437a4&r2=53d58bff90bb3286b2f61d13014ed436f71a9a41
http://git.horde.org/diff.php/kronolith/lib/Ajax/Application.php?rt=horde-git&r1=88f7e8ba4282d5611509e5ba633937f27fefa291&r2=53d58bff90bb3286b2f61d13014ed436f71a9a41

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

commit 74db9af4aebdc521455dc1477391c159aa35eaa5
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 16:08:38 2010 +0200

    Load the timeobjects *after* correcting the start/end dates.

 kronolith/lib/Driver/Horde.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/kronolith/lib/Driver/Horde.php?rt=horde-git&r1=7e3440b207db90c35549d3fc9a76a0ef82887fa3&r2=74db9af4aebdc521455dc1477391c159aa35eaa5

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

commit 088b82ba757203b4c1ca6331d969b373271d64d0
Author: Jan <jan at horde.org>
Date:   Wed Jul 7 17:10:32 2010 +0100

    If we don't need authentication and have a target URL, redirect there.

 horde/login.php |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

http://git.horde.org/diff.php/horde/login.php?rt=horde-git&r1=70b4825ed77a6552531f3ebf3087239aeb8f55a1&r2=088b82ba757203b4c1ca6331d969b373271d64d0

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

commit 7b56b34aa6917b4d90c96c1738487240845d8051
Author: Jan <jan at horde.org>
Date:   Wed Jul 7 17:10:33 2010 +0100

    Strip index.php from selfUrl().

 framework/Core/lib/Horde.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=8398aec5cbe6af225fc8bd12baac1ac02d0d9716&r2=7b56b34aa6917b4d90c96c1738487240845d8051

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

commit 586202d57dc3d5169a3866771504b3521bfde590
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 7 13:54:48 2010 -0400

    Don't request tags if we don't have any events.

 kronolith/lib/Driver/Sql.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/kronolith/lib/Driver/Sql.php?rt=horde-git&r1=865c9bed1e82d7fc81f423ad9ce8ccdb767b9603&r2=586202d57dc3d5169a3866771504b3521bfde590

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

commit df117aa51bba11482f395a239f599d49adccc845
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 7 14:13:51 2010 -0400

    fix parameter passing to Kronolith_Driver#listEvents

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

http://git.horde.org/diff.php/kronolith/lib/Api.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=df117aa51bba11482f395a239f599d49adccc845

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

commit b960711936f50a0e0ca5834e2d591cbf627a7734
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 7 23:53:20 2010 +0200

    Only support basic auth at the moment, so use that if any auth is requested.

 framework/Http/lib/Horde/Http/Request/Fopen.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/framework/Http/lib/Horde/Http/Request/Fopen.php?rt=horde-git&r1=20e60c30e94925d037a54dab94efd7e555d7bc72&r2=b960711936f50a0e0ca5834e2d591cbf627a7734

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

commit 0e5db4432a7cd1e122b0d5a17bc083c4d9baf624
Author: Jan Schneider <jan at horde.org>
Date:   Thu Jul 8 00:02:06 2010 +0200

    Make sure the Kronolith::getDriver() reloads the calendar parameters
    when re-using an existing Ical driver.
    Don't re-use the HTTP client if opening another calendar.
    Fix caching of error messages.
    Remote calendar user names are not encrypted.

 kronolith/lib/Driver.php      |   10 ++++++++++
 kronolith/lib/Driver/Ical.php |   17 ++++++++++++++---
 kronolith/lib/Kronolith.php   |   20 +++++++-------------
 3 files changed, 31 insertions(+), 16 deletions(-)

http://git.horde.org/diff.php/kronolith/lib/Driver.php?rt=horde-git&r1=3729c269d5cbd21e849894cac34440684b008d6f&r2=0e5db4432a7cd1e122b0d5a17bc083c4d9baf624
http://git.horde.org/diff.php/kronolith/lib/Driver/Ical.php?rt=horde-git&r1=89187d383d0ede48e7a6ec213243eb2d46a9f321&r2=0e5db4432a7cd1e122b0d5a17bc083c4d9baf624
http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=a220a0ffe003070c634feab906aeb2cea6ae01a5&r2=0e5db4432a7cd1e122b0d5a17bc083c4d9baf624

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

commit e649acf414796c7b4dbd3b2e79b1169c9f1603f9
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 7 18:13:09 2010 -0400

    Don't show errors before we've actually done anything.

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

http://git.horde.org/diff.php/kronolith/data.php?rt=horde-git&r1=c93cb8071ead39bfbfd0d2215c928eba5f4b3ee1&r2=e649acf414796c7b4dbd3b2e79b1169c9f1603f9

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

commit dd51814c9e217aafa20b3660a98050f64a6e92b9
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 7 18:48:20 2010 -0400

    The only expected exception here would be a Horde_Exception_Not_Found.
    
    Any other exception should be an error.

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

http://git.horde.org/diff.php/kronolith/lib/Api.php?rt=horde-git&r1=df117aa51bba11482f395a239f599d49adccc845&r2=dd51814c9e217aafa20b3660a98050f64a6e92b9

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

commit 3bd6cf612aa29fde902bb6a88b18b548b3aaa14b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 7 18:53:29 2010 -0400

    More complete support for reccuring event exceptions when dealing with iCalendar files
    Bug: 9091

 framework/iCalendar/iCalendar.php  |   17 ++++++--
 kronolith/lib/Api.php              |   10 ++---
 kronolith/lib/Event.php            |   77 +++++++++++++++++++++++++++++++++---
 kronolith/lib/Kronolith.php        |    1 +
 kronolith/lib/View/ExportEvent.php |    3 +-
 5 files changed, 89 insertions(+), 19 deletions(-)

http://git.horde.org/diff.php/framework/iCalendar/iCalendar.php?rt=horde-git&r1=767847624b436609597b50aa7aa372470cd8fb65&r2=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b
http://git.horde.org/diff.php/kronolith/lib/Api.php?rt=horde-git&r1=dd51814c9e217aafa20b3660a98050f64a6e92b9&r2=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b
http://git.horde.org/diff.php/kronolith/lib/Event.php?rt=horde-git&r1=5e9d5cbaf49d9e290c2111a99fe4444066c23e3e&r2=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b
http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=0e5db4432a7cd1e122b0d5a17bc083c4d9baf624&r2=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b
http://git.horde.org/diff.php/kronolith/lib/View/ExportEvent.php?rt=horde-git&r1=a700826d0e39e7c64a82f4fcf82e11e3ac0e7e07&r2=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b

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

commit bf5004456680db2ee20ba5e79f6538c8d1ebfd20
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Jul 7 20:14:08 2010 -0400

    changes

 kronolith/docs/CHANGES |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/kronolith/docs/CHANGES?rt=horde-git&r1=175fa4cbe26bab18f22dd7ed0ebe49305b4f2938&r2=bf5004456680db2ee20ba5e79f6538c8d1ebfd20

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

commit fcb3a7a5af40c81f0bf0775531ae29cbdecc5456
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 09:22:29 2010 -0400

    Fix method name.
    
    Closes Bug: 9128

 framework/Image/lib/Horde/Image/Gd.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Gd.php?rt=horde-git&r1=ff3e8d523943f55fcfac27b030f44882567657c8&r2=fcb3a7a5af40c81f0bf0775531ae29cbdecc5456

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

commit 88ec9da96b72801be182c03ebcafa0d367bac406
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 09:46:50 2010 -0400

    These methods need to be public so the effect objects can see them.

 framework/Image/lib/Horde/Image/Base.php |    4 -
 framework/Image/lib/Horde/Image/Gd.php   |  176 +++++++++++++++---------------
 2 files changed, 88 insertions(+), 92 deletions(-)

http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Base.php?rt=horde-git&r1=ff3e8d523943f55fcfac27b030f44882567657c8&r2=88ec9da96b72801be182c03ebcafa0d367bac406
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Gd.php?rt=horde-git&r1=fcb3a7a5af40c81f0bf0775531ae29cbdecc5456&r2=88ec9da96b72801be182c03ebcafa0d367bac406

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

commit 38b46ab20d10e662615512767a59765d788a4a1b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 10:02:39 2010 -0400

    2 more utility functions to Horde_Image

 framework/Image/lib/Horde/Image.php |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/framework/Image/lib/Horde/Image.php?rt=horde-git&r1=f8842f64ab7905d7ea007ea8e7fb0f64b43df2b8&r2=38b46ab20d10e662615512767a59765d788a4a1b

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

commit 06b6ed92a96c1298d0b3bf860a45a6eda53041eb
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 10:03:13 2010 -0400

    add some missing methods to the Gd driver that some effects use.
    
    I think my plan was to remove support for these effects from the GD driver,
    but I'll leave these in for now since they sort-of work. They are ugly as heck,
    but that's what you get for using Gd...

 framework/Image/lib/Horde/Image/Effect/Gd/RoundCorners.php |    2 +-
 framework/Image/lib/Horde/Image/Gd.php                     |   93 ++++++++++++
 2 files changed, 94 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/RoundCorners.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=06b6ed92a96c1298d0b3bf860a45a6eda53041eb
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Gd.php?rt=horde-git&r1=88ec9da96b72801be182c03ebcafa0d367bac406&r2=06b6ed92a96c1298d0b3bf860a45a6eda53041eb

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

commit 08ee3a40794fa9012f29b7ad3bea83f500cb244b
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 10:16:43 2010 -0400

    these don't return PEAR_Error

 framework/Image/lib/Horde/Image/Gd.php |   23 ++++-------------------
 1 files changed, 4 insertions(+), 19 deletions(-)

http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Gd.php?rt=horde-git&r1=06b6ed92a96c1298d0b3bf860a45a6eda53041eb&r2=08ee3a40794fa9012f29b7ad3bea83f500cb244b

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

commit a33d30317a9b84b942796dcd441c035f18a1a914
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 10:51:56 2010 -0400

    get rid of remaining PEAR_Error in Horde_Image

 framework/Image/lib/Horde/Image/Base.php                      |    5 +-
 framework/Image/lib/Horde/Image/Effect/Gd/DropShadow.php      |  108 +++----
 framework/Image/lib/Horde/Image/Effect/Gd/RoundCorners.php    |  156 ++++-----
 framework/Image/lib/Horde/Image/Effect/Gd/TextWatermark.php   |   28 +--
 framework/Image/lib/Horde/Image/Effect/Gd/UnsharpMask.php     |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/DropShadow.php      |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/DropShadow.php |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/PhotoStack.php |    4 +-
 framework/Image/tests/im.php                                  |    2 +-
 9 files changed, 129 insertions(+), 180 deletions(-)

http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Base.php?rt=horde-git&r1=88ec9da96b72801be182c03ebcafa0d367bac406&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/DropShadow.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/RoundCorners.php?rt=horde-git&r1=06b6ed92a96c1298d0b3bf860a45a6eda53041eb&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/TextWatermark.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/UnsharpMask.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Im/DropShadow.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Imagick/DropShadow.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Imagick/PhotoStack.php?rt=horde-git&r1=d1fb290f4e13496f8fb10bf3f538fdfd1d740b42&r2=a33d30317a9b84b942796dcd441c035f18a1a914
http://git.horde.org/diff.php/framework/Image/tests/im.php?rt=horde-git&r1=e433901b802136256a094ae1f870853e7f512e02&r2=a33d30317a9b84b942796dcd441c035f18a1a914

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

commit f196ce5d92751a9baa1c58a0b1ff67aaf2007f12
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 14:00:02 2010 -0400

    add missing semi-colon.

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

http://git.horde.org/diff.php/horde/js/redbox.js?rt=horde-git&r1=21634763c35139063b7767bfaa8170ff52fe8591&r2=f196ce5d92751a9baa1c58a0b1ff67aaf2007f12

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

commit d33c62c5acac6983d420f75e3d387e355c92dbec
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 14:01:38 2010 -0400

    global scope

 imp/lib/Ajax/Application.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/lib/Ajax/Application.php?rt=horde-git&r1=81614b2ef11c86926e2f94d9eb723e683923e05e&r2=d33c62c5acac6983d420f75e3d387e355c92dbec

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

commit 93510a91b24963b05c9c834cdf6ef395f7137193
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 14:13:33 2010 -0400

    Global scope

 horde/lib/Block/metar.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/horde/lib/Block/metar.php?rt=horde-git&r1=ee01f847f597abcbfe19e7719f220527c470346f&r2=93510a91b24963b05c9c834cdf6ef395f7137193

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

commit 840e1c7ffdb2fa6880e207de8d92bf4d6f7b77da
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 14:20:49 2010 -0400

    If default addressbook is not browsable, try one from the addressbook pref.
    
    Bug: 6536

 turba/browse.php |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/turba/browse.php?rt=horde-git&r1=283b143b7ab4b1ea4097530b7889e526eafe394e&r2=840e1c7ffdb2fa6880e207de8d92bf4d6f7b77da

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

commit c793472f47390e0d9acb3305cc5a7e9d655e98a2
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 14:23:51 2010 -0400

    changes

 turba/docs/CHANGES |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/turba/docs/CHANGES?rt=horde-git&r1=a85e65cacb497253afbf558a31e439fc8d265ae4&r2=c793472f47390e0d9acb3305cc5a7e9d655e98a2

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

commit 8c00d6c96fca1c435b98dff42d203a304d45af4d
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 14:53:12 2010 -0400

    need to ucfirst() the $app name when using it as a class name part.

 framework/Core/lib/Horde/Registry.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=8fd97bd75d45beb6d6521962ed9a452d97953b5f&r2=8c00d6c96fca1c435b98dff42d203a304d45af4d

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

commit ea099d3a6cb30867c29b833fca5cac40fb110ec6
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 17:22:47 2010 -0400

    Revert "need to ucfirst() the $app name when using it as a class name part."
    
    This reverts commit 8c00d6c96fca1c435b98dff42d203a304d45af4d.

 framework/Core/lib/Horde/Registry.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=8c00d6c96fca1c435b98dff42d203a304d45af4d&r2=ea099d3a6cb30867c29b833fca5cac40fb110ec6

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

commit 898c9178ce8a81ebff27112895734a1c479cbdb4
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 18:06:33 2010 -0400

    Make use of the configspecial we have for contact sources.
    
    Re-add this now that we are working towards Horde 4
    (Finally) closes Bug: 3271

 turba/config/conf.xml |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/turba/config/conf.xml?rt=horde-git&r1=c31211fd5cee20c7fe88e3517d6be96a361f6168&r2=898c9178ce8a81ebff27112895734a1c479cbdb4

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

commit ec12e44b9ddbe58bc23eeb9b305486eff75fde6f
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:29:28 2010 -0600

    Don't display HTML image options if HTML inline viewing is disabled

 imp/lib/Prefs/Ui.php |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=ec12e44b9ddbe58bc23eeb9b305486eff75fde6f

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

commit a6d02a936008e877e0a4d5f615f5349709005451
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:33:50 2010 -0600

    Fix typo.

 imp/lib/Mime/Viewer/Html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=a6d02a936008e877e0a4d5f615f5349709005451

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

commit 0d3074deac715da0270637b4398536f6032e7024
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:47:41 2010 -0600

    Request #9129: Allow admin to define list of safe e-mail addresses that will not experience HTML image blocking

 imp/config/mime_drivers.php.dist |    5 ++++-
 imp/docs/CHANGES                 |    2 ++
 imp/lib/Mime/Viewer/Html.php     |   29 ++++++++++++++---------------
 3 files changed, 20 insertions(+), 16 deletions(-)

http://git.horde.org/diff.php/imp/config/mime_drivers.php.dist?rt=horde-git&r1=0106a25421134e74ab8cfc514492077d22c9dfc4&r2=0d3074deac715da0270637b4398536f6032e7024
http://git.horde.org/diff.php/imp/docs/CHANGES?rt=horde-git&r1=5a820898cfc8b88f235ae52cbc1de20081e04b52&r2=0d3074deac715da0270637b4398536f6032e7024
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=a6d02a936008e877e0a4d5f615f5349709005451&r2=0d3074deac715da0270637b4398536f6032e7024

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

commit a78f6933f4a0d2f80e7a3952c15bbe8f436815ea
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:58:24 2010 -0600

    Reuse existing code

 framework/Core/lib/Horde/Registry.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=ea099d3a6cb30867c29b833fca5cac40fb110ec6&r2=a78f6933f4a0d2f80e7a3952c15bbe8f436815ea

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

commit d1c70514b002b1d0ce4783353bac7c9042c60140
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jul 9 00:25:04 2010 -0600

    Don't use Horde-specific app assumption in factory.

 framework/Crypt/lib/Horde/Crypt.php             |   29 ++++++++++------------
 framework/Text_Filter/lib/Horde/Text/Filter.php |   27 +++++++++------------
 imp/lib/Injector/Binder/Pgp.php                 |    2 +-
 imp/lib/Injector/Binder/Smime.php               |    2 +-
 4 files changed, 27 insertions(+), 33 deletions(-)

http://git.horde.org/diff.php/framework/Crypt/lib/Horde/Crypt.php?rt=horde-git&r1=de347bba139d81860155af2c4b215eeccc180746&r2=d1c70514b002b1d0ce4783353bac7c9042c60140
http://git.horde.org/diff.php/framework/Text_Filter/lib/Horde/Text/Filter.php?rt=horde-git&r1=9326547e493b8025bec6ddd708d2769d9af12167&r2=d1c70514b002b1d0ce4783353bac7c9042c60140
http://git.horde.org/diff.php/imp/lib/Injector/Binder/Pgp.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=d1c70514b002b1d0ce4783353bac7c9042c60140
http://git.horde.org/diff.php/imp/lib/Injector/Binder/Smime.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=d1c70514b002b1d0ce4783353bac7c9042c60140

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

commit 01be634d9b7a943fb6d437db62005cf99636dc10
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jul 9 00:58:36 2010 -0600

    Emoticons filter fixes.
    
    Fix image generation with new Horde_Themes code.
    Remove Core dependency from Emoticons filter by moving image generation
    code to a Core library.

 framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php   |   30 ++++++++
 framework/Core/package.xml                                |   12 +++-
 framework/Text_Filter/lib/Horde/Text/Filter/Emoticons.php |   49 +++++++------
 framework/Text_Filter/package.xml                         |    3 +-
 imp/lib/Mime/Viewer/Html.php                              |    2 +-
 imp/lib/Mime/Viewer/Plain.php                             |    2 +-
 6 files changed, 71 insertions(+), 27 deletions(-)
 create mode 100644 framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php

http://git.horde.org/co.php/framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php?rt=horde-git&r=01be634d9b7a943fb6d437db62005cf99636dc10
http://git.horde.org/diff.php/framework/Core/package.xml?rt=horde-git&r1=ae1d6ce5e8d61aba5949fd83f613943d66cbcab8&r2=01be634d9b7a943fb6d437db62005cf99636dc10
http://git.horde.org/diff.php/framework/Text_Filter/lib/Horde/Text/Filter/Emoticons.php?rt=horde-git&r1=97fd203dcaaf5ddf7c9c2252eb44ac76e8d84846&r2=01be634d9b7a943fb6d437db62005cf99636dc10
http://git.horde.org/diff.php/framework/Text_Filter/package.xml?rt=horde-git&r1=9313cdee4f6ab63e30b3be1a858ab101b6a5b111&r2=01be634d9b7a943fb6d437db62005cf99636dc10
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=0d3074deac715da0270637b4398536f6032e7024&r2=01be634d9b7a943fb6d437db62005cf99636dc10
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Plain.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=01be634d9b7a943fb6d437db62005cf99636dc10

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

commit c099e5f6cd0f63ef1a337696a2c3e785c6e9c0bf
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 20:38:02 2010 -0400

    avoid undefined index notices

 imp/message.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/message.php?rt=horde-git&r1=25e4e9f441d22b3df2b6f6396ff8b4be3063695c&r2=c099e5f6cd0f63ef1a337696a2c3e785c6e9c0bf

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

commit 90a9aa6cd06eeb00f09baf369f2c087210dc68f8
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Jul 8 19:56:04 2010 -0400

    Handle iTip CANCEL request of a recurring event instance correctly.
    
    According to RFC 2446, when cancelling an instance of a recurring
    event, the RECURRENCE-ID value MUST be specified along with the UID.
    If cancelling the entire event series, the RECURRENCE-ID value
    MUST NOT be included.
    
    Bug: 8956

 imp/lib/Mime/Viewer/Itip.php |   10 ++++++++--
 kronolith/lib/Api.php        |   20 ++++++++++++++++----
 kronolith/lib/Kronolith.php  |    3 +++
 3 files changed, 27 insertions(+), 6 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=1a61808f3fb6881144106806a21e9532c25775ae&r2=90a9aa6cd06eeb00f09baf369f2c087210dc68f8
http://git.horde.org/diff.php/kronolith/lib/Api.php?rt=horde-git&r1=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b&r2=90a9aa6cd06eeb00f09baf369f2c087210dc68f8
http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=3bd6cf612aa29fde902bb6a88b18b548b3aaa14b&r2=90a9aa6cd06eeb00f09baf369f2c087210dc68f8

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

commit 82a31168b7992db45c239c110f50197c600d7f17
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 12:20:47 2010 -0400

    ADD is only used when adding new instances to an existing recurring event series.
    
    As per RFC 2446, REQUEST should be used when modifying an existing event. We currently
    don't support adding instances to the existing recurring event series via iTip without
    sending the entire event series again.
    
    Bug: 9131
    Reported By: patrick.abiven at apitech.fr

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

http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=90a9aa6cd06eeb00f09baf369f2c087210dc68f8&r2=82a31168b7992db45c239c110f50197c600d7f17

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

commit 376aa47974882aa477dfc7ba585387fd6811c326
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 12:31:37 2010 -0400

    prune code that produced no effects.

 imp/lib/Mime/Viewer/Itip.php |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=90a9aa6cd06eeb00f09baf369f2c087210dc68f8&r2=376aa47974882aa477dfc7ba585387fd6811c326

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

commit 7be850ecde5e62cccfa286fb73ad568f75ce2c08
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 12:33:02 2010 -0400

    Revert "prune code that produced no effects."
    
    This reverts commit 376aa47974882aa477dfc7ba585387fd6811c326.

 imp/lib/Mime/Viewer/Itip.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=376aa47974882aa477dfc7ba585387fd6811c326&r2=7be850ecde5e62cccfa286fb73ad568f75ce2c08

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

commit 3dd61a3ec5c3ff3e8209199afd28abdfd575ba6e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 12:34:19 2010 -0400

    Looks like this is probably what was intended.
    
    Calling calendar/export first while catching the exception will avoid
    unwanted notifications when this isn't actually an update operation.

 imp/lib/Mime/Viewer/Itip.php |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=7be850ecde5e62cccfa286fb73ad568f75ce2c08&r2=3dd61a3ec5c3ff3e8209199afd28abdfd575ba6e

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

commit fd150aee89b8cd3ef784c67557c9588396e209a0
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 12:47:30 2010 -0400

    BFN

 kronolith/docs/CHANGES |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/kronolith/docs/CHANGES?rt=horde-git&r1=bf5004456680db2ee20ba5e79f6538c8d1ebfd20&r2=fd150aee89b8cd3ef784c67557c9588396e209a0

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

commit 7c348a50499e67a0618208e755b4794b28f6fef6
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jul 9 11:00:19 2010 -0600

    Was wondering why I had a 150px gap on every page

 horde/services/portal/sidebar.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/horde/services/portal/sidebar.php?rt=horde-git&r1=e6ef98cec3f442f8516a93ece38299f701c40006&r2=7c348a50499e67a0618208e755b4794b28f6fef6

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

commit 2d9e92a12f14de23c0db49575296a890da533583
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jul 9 11:13:14 2010 -0600

    Simplify

 framework/Core/lib/Horde.php |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=7b56b34aa6917b4d90c96c1738487240845d8051&r2=2d9e92a12f14de23c0db49575296a890da533583

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

commit 05f2a53df4b555f1fdaded5213af80fed4bc0907
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jul 9 11:15:14 2010 -0600

    I *think* we always want Horde::url() to use Horde webroot
    
    All of a sudden, I was getting weird redirects to URLs like
    example.com/imp/imp during logins - because webroot was example.com/imp
    
    This might be an artifact of new sidebar code (?)
    
    If you want the application's webroot, I believe this is what
    Horde::applicationUrl() is for.

 framework/Core/lib/Horde.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=2d9e92a12f14de23c0db49575296a890da533583&r2=05f2a53df4b555f1fdaded5213af80fed4bc0907

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

commit bf04645b471373b610d645ac1da27e4b88a9437c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Fri Jul 9 11:24:52 2010 -0600

    Output inline script when using dimp but displaying non-dimp content

 imp/templates/common-header.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/imp/templates/common-header.inc?rt=horde-git&r1=4f3bc19eac444e3d99b7e56b188bd9f99db3686d&r2=bf04645b471373b610d645ac1da27e4b88a9437c

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

commit f712baf025926777ed585e9aa5c13930f0c0a4d3
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 14:52:22 2010 -0400

    simplify

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

http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=82a31168b7992db45c239c110f50197c600d7f17&r2=f712baf025926777ed585e9aa5c13930f0c0a4d3

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

commit 4a32380b8c4f17a02534c6bcac3b6583aad080c9
Merge: 08e6f4b f712baf
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 15:15:11 2010 -0400

    Merge branch 'master' into H4-Jonah

 framework/Core/lib/Horde.php                                      |   14 +-
 framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php           |   30 +
 framework/Core/lib/Horde/Registry.php                             |    3 +-
 framework/Core/package.xml                                        |   12 +-
 framework/Crypt/lib/Horde/Crypt.php                               |   29 +-
 framework/Http/lib/Horde/Http/Request/Fopen.php                   |    1 +
 framework/Image/lib/Horde/Image.php                               |   17 +
 framework/Image/lib/Horde/Image/Base.php                          |    9 +-
 framework/Image/lib/Horde/Image/Effect/Gd/DropShadow.php          |  108 +-
 framework/Image/lib/Horde/Image/Effect/Gd/RoundCorners.php        |  156 +-
 framework/Image/lib/Horde/Image/Effect/Gd/TextWatermark.php       |   28 +-
 framework/Image/lib/Horde/Image/Effect/Gd/UnsharpMask.php         |    2 +-
 framework/Image/lib/Horde/Image/Effect/Im/DropShadow.php          |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/DropShadow.php     |    2 +-
 framework/Image/lib/Horde/Image/Effect/Imagick/PhotoStack.php     |    4 +-
 framework/Image/lib/Horde/Image/Gd.php                            |  240 +-
 framework/Image/tests/im.php                                      |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Exception.php       |   72 -
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php        |   44 +
 .../Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php  |    4 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php  |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php  |    2 +-
 framework/Kolab_Filter/lib/Horde/Kolab/Resource.php               |  964 -----
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php         |  102 -
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php      |  153 -
 .../Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php      |  117 -
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php |   55 -
 framework/Kolab_Filter/lib/Horde/Kolab/Resource/Itip.php          |  257 --
 framework/Kolab_Resource/COPYING                                  |  504 +++
 framework/Kolab_Resource/lib/Horde/Kolab/Resource.php             |  812 ++++
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Epoch.php       |  102 +
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php   |   72 +
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy.php    |  162 +
 .../Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Kolab.php    |  117 +
 .../Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Mock.php     |   55 +
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Itip.php        |  257 ++
 framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php       |   90 +
 framework/Kolab_Resource/package.xml                              |  154 +
 .../test/Horde/Kolab/Resource/Integration/ResourceTest.php        |   41 +
 framework/Kolab_Resource/test/Horde/Kolab/Resource/TestCase.php   |   33 +
 framework/Kolab_Resource/test/Horde/Kolab/Resource/phpunit.xml    |    8 +
 framework/Secret/lib/Horde/Secret.php                             |    4 +-
 framework/Text_Filter/lib/Horde/Text/Filter.php                   |   27 +-
 framework/Text_Filter/lib/Horde/Text/Filter/Emoticons.php         |   49 +-
 framework/Text_Filter/package.xml                                 |    3 +-
 framework/View/lib/Horde/View.php                                 |    2 -
 framework/View/lib/Horde/View/Helper/Benchmark.php                |    4 +-
 framework/View/lib/Horde/View/Helper/Capture.php                  |    8 +-
 framework/View/lib/Horde/View/Helper/Text.php                     |   14 +-
 framework/iCalendar/iCalendar.php                                 |   17 +-
 horde/js/redbox.js                                                |    4 +-
 horde/lib/Block/metar.php                                         |    2 +-
 horde/login.php                                                   |   16 +-
 horde/services/portal/sidebar.php                                 |    4 +-
 imp/attachment.php                                                |    2 +-
 imp/config/mime_drivers.php.dist                                  |    5 +-
 imp/docs/CHANGES                                                  |    2 +
 imp/js/dialog.js                                                  |   49 +-
 imp/js/dimpbase.js                                                |   53 +-
 imp/js/mailbox.js                                                 |   62 +-
 imp/js/message.js                                                 |   35 +-
 imp/lib/Ajax/Application.php                                      |    2 +-
 imp/lib/IMP.php                                                   |    4 +-
 imp/lib/Injector/Binder/Pgp.php                                   |    2 +-
 imp/lib/Injector/Binder/Smime.php                                 |    2 +-
 imp/lib/Message.php                                               |    8 +-
 imp/lib/Mime/Viewer/Html.php                                      |   31 +-
 imp/lib/Mime/Viewer/Itip.php                                      |   40 +-
 imp/lib/Mime/Viewer/Plain.php                                     |    2 +-
 imp/lib/Prefs/Ui.php                                              |    9 +
 imp/mailbox.php                                                   |    3 +-
 imp/message.php                                                   |   10 +-
 imp/templates/common-header.inc                                   |    3 +-
 imp/templates/dimp/index.inc                                      |    9 -
 imp/templates/imp/javascript_defs.php                             |    1 +
 kronolith/data.php                                                |    2 +-
 kronolith/docs/CHANGES                                            |    4 +
 kronolith/js/kronolith.js                                         |  133 +-
 kronolith/lib/Ajax/Application.php                                |   19 +-
 kronolith/lib/Api.php                                             |   35 +-
 kronolith/lib/Driver.php                                          |   10 +
 kronolith/lib/Driver/Horde.php                                    |    4 +-
 kronolith/lib/Driver/Ical.php                                     |   69 +-
 kronolith/lib/Driver/Sql.php                                      |    2 +-
 kronolith/lib/Event.php                                           |   77 +-
 kronolith/lib/Kronolith.php                                       |   27 +-
 kronolith/lib/View/ExportEvent.php                                |    3 +-
 kronolith/templates/itip/notification.html.php                    |   24 +-
 kronolith/templates/itip/notification.plain.php                   |   14 +-
 luxor/templates/directory.html.php                                |    4 +-
 luxor/templates/symbol.html.php                                   |   16 +-
 turba/browse.php                                                  |   11 +
 turba/config/conf.xml                                             |   16 +-
 turba/docs/CHANGES                                                |    2 +
 turba/templates/search/advanced.html.php                          |   16 +-
 turba/templates/search/basic.html.php                             |   12 +-
 turba/templates/search/duplicate.html.php                         |   10 +-
 turba/templates/search/duplicate/contact_header.html.php          |    8 +-
 turba/templates/search/duplicate/list.html.php                    |   12 +-
 turba/templates/search/header.html.php                            |    4 +-
 turba/templates/search/vbook.html.php                             |    4 +-
 101 files changed, 3461 insertions(+), 2403 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde.php?rt=horde-git&r1=8398aec5cbe6af225fc8bd12baac1ac02d0d9716&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Core/lib/Horde/Registry.php?rt=horde-git&r1=8fd97bd75d45beb6d6521962ed9a452d97953b5f&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Core/package.xml?rt=horde-git&r1=ae1d6ce5e8d61aba5949fd83f613943d66cbcab8&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Crypt/lib/Horde/Crypt.php?rt=horde-git&r1=de347bba139d81860155af2c4b215eeccc180746&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Http/lib/Horde/Http/Request/Fopen.php?rt=horde-git&r1=20e60c30e94925d037a54dab94efd7e555d7bc72&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image.php?rt=horde-git&r1=f8842f64ab7905d7ea007ea8e7fb0f64b43df2b8&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Base.php?rt=horde-git&r1=ff3e8d523943f55fcfac27b030f44882567657c8&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/DropShadow.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/RoundCorners.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/TextWatermark.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Gd/UnsharpMask.php?rt=horde-git&r1=af5c15a9b98f366f10b3779397b892a16d89b704&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Im/DropShadow.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Imagick/DropShadow.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Effect/Imagick/PhotoStack.php?rt=horde-git&r1=d1fb290f4e13496f8fb10bf3f538fdfd1d740b42&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/lib/Horde/Image/Gd.php?rt=horde-git&r1=ff3e8d523943f55fcfac27b030f44882567657c8&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Image/tests/im.php?rt=horde-git&r1=e433901b802136256a094ae1f870853e7f512e02&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Exception.php?rt=horde-git&r1=4d249a3af4faea6509fe8da806264dd5d87ab4e5&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Incoming.php?rt=horde-git&r1=917493ab75dbc9730c59808ca8428e8843bbb264&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/DovecotLDA.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/lmtp.php?rt=horde-git&r1=da4c5687690883de5668a2ce8bb7b279a815b6d1&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Transport/smtp.php?rt=horde-git&r1=da4c5687690883de5668a2ce8bb7b279a815b6d1&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource.php?rt=horde-git&r1=ca6b51851fce63520490f0c5295db8a380d281bf&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Epoch.php?rt=horde-git&r1=2be282e64fc4519a6254ec721be3751cd42c7a2d&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy.php?rt=horde-git&r1=9cb1db2414871d3c98a0ebed0d11288c84cb384f&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Kolab.php?rt=horde-git&r1=240ff73e2a3bcfe5e5649e5d9153d87b25471d36&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Freebusy/Mock.php?rt=horde-git&r1=9cb1db2414871d3c98a0ebed0d11288c84cb384f&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Kolab_Filter/lib/Horde/Kolab/Resource/Itip.php?rt=horde-git&r1=2be282e64fc4519a6254ec721be3751cd42c7a2d&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/COPYING?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Epoch.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Exception.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Kolab.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Freebusy/Mock.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Itip.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/lib/Horde/Kolab/Resource/Reply.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/package.xml?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/test/Horde/Kolab/Resource/Integration/ResourceTest.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/test/Horde/Kolab/Resource/TestCase.php?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/co.php/framework/Kolab_Resource/test/Horde/Kolab/Resource/phpunit.xml?rt=horde-git&r=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Secret/lib/Horde/Secret.php?rt=horde-git&r1=3db5893ecb72a2f35b73ece266e26594b8045f78&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Text_Filter/lib/Horde/Text/Filter.php?rt=horde-git&r1=9326547e493b8025bec6ddd708d2769d9af12167&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Text_Filter/lib/Horde/Text/Filter/Emoticons.php?rt=horde-git&r1=97fd203dcaaf5ddf7c9c2252eb44ac76e8d84846&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/Text_Filter/package.xml?rt=horde-git&r1=9313cdee4f6ab63e30b3be1a858ab101b6a5b111&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/View/lib/Horde/View.php?rt=horde-git&r1=29bba74db207a59ad3dc50da865551be953b26cc&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/View/lib/Horde/View/Helper/Benchmark.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/View/lib/Horde/View/Helper/Capture.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/View/lib/Horde/View/Helper/Text.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/framework/iCalendar/iCalendar.php?rt=horde-git&r1=767847624b436609597b50aa7aa372470cd8fb65&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/horde/js/redbox.js?rt=horde-git&r1=4ff6763fddf80477f6e7d5c169bedf33cbf8e6ec&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/horde/lib/Block/metar.php?rt=horde-git&r1=ee01f847f597abcbfe19e7719f220527c470346f&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/horde/login.php?rt=horde-git&r1=70b4825ed77a6552531f3ebf3087239aeb8f55a1&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/horde/services/portal/sidebar.php?rt=horde-git&r1=e6ef98cec3f442f8516a93ece38299f701c40006&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/attachment.php?rt=horde-git&r1=1065ab77abdfe7b025e24dab33a2db9cbbea90ac&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/config/mime_drivers.php.dist?rt=horde-git&r1=0106a25421134e74ab8cfc514492077d22c9dfc4&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/docs/CHANGES?rt=horde-git&r1=5a820898cfc8b88f235ae52cbc1de20081e04b52&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/js/dialog.js?rt=horde-git&r1=1ed41f6721afe6cf43bd54c58ab8252d0346ac65&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/js/dimpbase.js?rt=horde-git&r1=0217d059e2e1a8f9bab3193d863996ef5c80a7c7&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/js/mailbox.js?rt=horde-git&r1=9c078bc25ad56f126dafab18d31b8bfc594fa44a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/js/message.js?rt=horde-git&r1=4ff6763fddf80477f6e7d5c169bedf33cbf8e6ec&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Ajax/Application.php?rt=horde-git&r1=81614b2ef11c86926e2f94d9eb723e683923e05e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/IMP.php?rt=horde-git&r1=bad88c7b12aa154a64de9471361a2f28fe1f684e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Injector/Binder/Pgp.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Injector/Binder/Smime.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Message.php?rt=horde-git&r1=bf4719ffd4d666e00287a27dc1f42085a36ccb0e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Itip.php?rt=horde-git&r1=1a61808f3fb6881144106806a21e9532c25775ae&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Plain.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/mailbox.php?rt=horde-git&r1=4f3bc19eac444e3d99b7e56b188bd9f99db3686d&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/message.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/templates/common-header.inc?rt=horde-git&r1=4f3bc19eac444e3d99b7e56b188bd9f99db3686d&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/templates/dimp/index.inc?rt=horde-git&r1=befcebe74422f7fcf319745bc897ab3eb169b5f1&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/imp/templates/imp/javascript_defs.php?rt=horde-git&r1=9c078bc25ad56f126dafab18d31b8bfc594fa44a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/data.php?rt=horde-git&r1=c93cb8071ead39bfbfd0d2215c928eba5f4b3ee1&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/docs/CHANGES?rt=horde-git&r1=175fa4cbe26bab18f22dd7ed0ebe49305b4f2938&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/js/kronolith.js?rt=horde-git&r1=6073b5600a3b4f4edd73aad636e28c6a21d437a4&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Ajax/Application.php?rt=horde-git&r1=88f7e8ba4282d5611509e5ba633937f27fefa291&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Api.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Driver.php?rt=horde-git&r1=3729c269d5cbd21e849894cac34440684b008d6f&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Driver/Horde.php?rt=horde-git&r1=7e3440b207db90c35549d3fc9a76a0ef82887fa3&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Driver/Ical.php?rt=horde-git&r1=94173fc3fb4b8efb716dffedbecabab49f147722&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Driver/Sql.php?rt=horde-git&r1=865c9bed1e82d7fc81f423ad9ce8ccdb767b9603&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Event.php?rt=horde-git&r1=5e9d5cbaf49d9e290c2111a99fe4444066c23e3e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/Kronolith.php?rt=horde-git&r1=a220a0ffe003070c634feab906aeb2cea6ae01a5&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/lib/View/ExportEvent.php?rt=horde-git&r1=a700826d0e39e7c64a82f4fcf82e11e3ac0e7e07&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/templates/itip/notification.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/kronolith/templates/itip/notification.plain.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/luxor/templates/directory.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/luxor/templates/symbol.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/browse.php?rt=horde-git&r1=283b143b7ab4b1ea4097530b7889e526eafe394e&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/config/conf.xml?rt=horde-git&r1=c31211fd5cee20c7fe88e3517d6be96a361f6168&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/docs/CHANGES?rt=horde-git&r1=a85e65cacb497253afbf558a31e439fc8d265ae4&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/advanced.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/basic.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/duplicate.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/duplicate/contact_header.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/duplicate/list.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/header.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9
http://git.horde.org/diff.php/turba/templates/search/vbook.html.php?rt=horde-git&r1=f694e1112316d4cc7bef9e9275e538f64628095a&r2=4a32380b8c4f17a02534c6bcac3b6583aad080c9

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

commit 7ffd42aab69fe45dafa275848ecb886fe2417d71
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 17:18:47 2010 -0400

    getAvailableTypes() should be in Jonah::

 jonah/lib/Form/Feed.php |    2 +-
 jonah/lib/Jonah.php     |   23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/jonah/lib/Form/Feed.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=7ffd42aab69fe45dafa275848ecb886fe2417d71
http://git.horde.org/diff.php/jonah/lib/Jonah.php?rt=horde-git&r1=08e6f4becb287c1c4b292595210ede76e5b26cf3&r2=7ffd42aab69fe45dafa275848ecb886fe2417d71

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

commit 10e46cc2d98a99f43c29b62fa9619d810a329b0e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 18:48:22 2010 -0400

    no need for aggregate view

 jonah/channels/aggregate.php |  147 ------------------------------------------
 1 files changed, 0 insertions(+), 147 deletions(-)
 delete mode 100644 jonah/channels/aggregate.php

http://git.horde.org/diff.php/jonah/channels/aggregate.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=10e46cc2d98a99f43c29b62fa9619d810a329b0e

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

commit 968d42008125617bee6c1a834a10678ca86a9fc0
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 18:49:53 2010 -0400

    Use Horde_View for channel listing, remove needlessly complicated template rendering
    for channel views

 jonah/channels/delete.php               |   23 +++-------
 jonah/channels/edit.php                 |   17 ++-----
 jonah/channels/index.php                |   75 ++++++++++--------------------
 jonah/lib/Form/Feed.php                 |    2 +-
 jonah/templates/channels/index.html     |   58 ------------------------
 jonah/templates/channels/index.html.php |   54 ++++++++++++++++++++++
 jonah/templates/menu.inc                |    5 ++
 7 files changed, 96 insertions(+), 138 deletions(-)
 delete mode 100644 jonah/templates/channels/index.html
 create mode 100644 jonah/templates/channels/index.html.php
 create mode 100644 jonah/templates/menu.inc

http://git.horde.org/diff.php/jonah/channels/delete.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=968d42008125617bee6c1a834a10678ca86a9fc0
http://git.horde.org/diff.php/jonah/channels/edit.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=968d42008125617bee6c1a834a10678ca86a9fc0
http://git.horde.org/diff.php/jonah/channels/index.php?rt=horde-git&r1=8a732b476caa2ef3bcc8f145c623a09e05dd3cea&r2=968d42008125617bee6c1a834a10678ca86a9fc0
http://git.horde.org/diff.php/jonah/lib/Form/Feed.php?rt=horde-git&r1=7ffd42aab69fe45dafa275848ecb886fe2417d71&r2=968d42008125617bee6c1a834a10678ca86a9fc0
http://git.horde.org/diff.php/jonah/templates/channels/index.html?rt=horde-git&r1=d80e67854208b7bc13b1002103a7104c4d83c7c5&r2=968d42008125617bee6c1a834a10678ca86a9fc0
http://git.horde.org/co.php/jonah/templates/channels/index.html.php?rt=horde-git&r=968d42008125617bee6c1a834a10678ca86a9fc0
http://git.horde.org/co.php/jonah/templates/menu.inc?rt=horde-git&r=968d42008125617bee6c1a834a10678ca86a9fc0

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

commit 2a6760a484a70cd43f20e89b8013c253ea181791
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Fri Jul 9 18:50:40 2010 -0400

    we still have composite channels

 jonah/lib/Driver/Sql.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/jonah/lib/Driver/Sql.php?rt=horde-git&r1=f80000f601a3ad579f1e77a4325caa9eb038d7a0&r2=2a6760a484a70cd43f20e89b8013c253ea181791




More information about the commits mailing list