[commits] Horde branch develop updated. 46c42aa19fbf432da610facdbfad16ecddbd59e0

[Jan Schneider]

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

from: e319aeea1acb51c9bdc0cebe49b105c235961a7b

7652ad8 [jan] Include time when parsing recurrence end date from vCalendar/iCalendar.
7339429 Singular
65bf889 Fix tests.
46c42aa Fix unserialization errors.

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

commit 7652ad89e5a679c97a9c0d679c8569984bad6340
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 16 21:23:40 2012 +0200

    [jan] Include time when parsing recurrence end date from vCalendar/iCalendar.
    
    Conflicts:
    
    	framework/Date/lib/Horde/Date/Recurrence.php
    	framework/Date/package.xml

 framework/Date/lib/Horde/Date/Recurrence.php               |   10 +++++--
 framework/Date/package.xml                                 |    4 +-
 framework/Date/test/Horde/Date/RecurrenceTest.php          |   16 ++++++------
 kronolith/test/Kronolith/Integration/FromIcalendarTest.php |    2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/7652ad89e5a679c97a9c0d679c8569984bad6340

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

commit 7339429e2064133762e48bc0dceba3519a4ff281
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 16 21:32:23 2012 +0200

    Singular

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

http://git.horde.org/horde-git/-/commit/7339429e2064133762e48bc0dceba3519a4ff281

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

commit 65bf8892c9febe5171fb7d3abca307dd2ee5be62
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 16 23:49:06 2012 +0200

    Fix tests.

 kronolith/test/Kronolith/Integration/ToIcalendarTest.php |    9 ++++-----
 kronolith/test/Kronolith/Stub/Registry.php               |    4 +++-
 kronolith/test/Kronolith/fixtures/export1.ics            |    9 ++++-----
 kronolith/test/Kronolith/fixtures/export2.ics            |    8 ++++----
 kronolith/test/Kronolith/fixtures/export3.ics            |    6 +++---
 kronolith/test/Kronolith/fixtures/export4.ics            |    5 +++--
 6 files changed, 21 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/65bf8892c9febe5171fb7d3abca307dd2ee5be62

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

commit 46c42aa19fbf432da610facdbfad16ecddbd59e0
Author: Jan Schneider <jan at horde.org>
Date:   Thu Aug 16 19:56:27 2012 +0200

    Fix unserialization errors.
    
    Still doesn't work with Kolab for some unknown reason. I've already spent too
    much time on this, skip Kolab tests for now.

 kronolith/test/Kronolith/Integration/Driver/KolabTest.php |    6 ++++++
 kronolith/test/Kronolith/Stub/ShareFactory.php            |    8 +++++++-
 kronolith/test/Kronolith/TestCase.php                     |    1 +
 3 files changed, 14 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/46c42aa19fbf432da610facdbfad16ecddbd59e0