[commits] Horde branch develop updated. 247017bf10d9951f1f5cdf1b6e0a5bed30bb4153

[Michael M Slusarz]

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

from: 3fa2bdadfcc372902eeaec15d7524f10b124cc77

6290e01 Add test for creating Horde_Date_Recurrence object in a different timezone than the date_default_timezone_get timezone.
1c7fc33 lowercase
a76cc4d Fix weekly recurrence instances having the wrong timezone set.
e908a85 Allow setting the timezone property directly, without altering the actual time stored in the object.
9c7f1a8 Add method to get the Appointment's timezone identifier
2bf7d70 Set the appointment's timezone when creating the Recurrence object.
04a63a2 This test now passes, remove skipped marker.
d5affa8 changes
5fd983c Update package list
4ce4bd7 Fix property names
247017b Merge branch 'master' into develop

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

commit 6290e01ccea31ec9463003d4956ef22a71afb924
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 17:12:31 2011 -0500

    Add test for creating Horde_Date_Recurrence object in a different timezone
    than the date_default_timezone_get timezone.

 framework/Date/test/Horde/Date/RecurrenceTest.php |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/6290e01ccea31ec9463003d4956ef22a71afb924

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

commit 1c7fc33fa97339d9f3b48598966b2562a1774585
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:06:40 2011 -0500

    lowercase

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

http://git.horde.org/horde-git/-/commit/1c7fc33fa97339d9f3b48598966b2562a1774585

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

commit a76cc4db938264f6c14a3e624f4705261d4df256
Author: Jan Schneider <jan at horde.org>
Date:   Sat Nov 12 01:18:28 2011 +0100

    Fix weekly recurrence instances having the wrong timezone set.

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

http://git.horde.org/horde-git/-/commit/a76cc4db938264f6c14a3e624f4705261d4df256

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

commit e908a8576bdd327f5131025bf342b125bdbda2f7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:14:56 2011 -0500

    Allow setting the timezone property directly, without altering the actual time stored in the object.

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

http://git.horde.org/horde-git/-/commit/e908a8576bdd327f5131025bf342b125bdbda2f7

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

commit 9c7f1a8b7cd6a0fe269b33ce6f546f1421aadcd6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:31:22 2011 -0500

    Add method to get the Appointment's timezone identifier

 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |   11 +++++
 1 files changed, 11 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/9c7f1a8b7cd6a0fe269b33ce6f546f1421aadcd6

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

commit 2bf7d701e45fc173adf3dd510491f504fe304fa9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:31:51 2011 -0500

    Set the appointment's timezone when creating the Recurrence object.

 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/2bf7d701e45fc173adf3dd510491f504fe304fa9

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

commit 04a63a2ea523740a24927a6a21a55fdb45007d0a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:32:28 2011 -0500

    This test now passes, remove skipped marker.

 framework/ActiveSync/test/Horde/ActiveSync/AppointmentTest.php |   11 ++++---
 1 files changed, 6 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/04a63a2ea523740a24927a6a21a55fdb45007d0a

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

commit d5affa8a1c61617356045992efd01b4942fba353
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:43:22 2011 -0500

    changes

 framework/ActiveSync/package.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/d5affa8a1c61617356045992efd01b4942fba353

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

commit 5fd983cbf81c97c08ded594f17c34335b3953c58
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 18:44:02 2011 -0500

    Update package list

 framework/ActiveSync/package.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/5fd983cbf81c97c08ded594f17c34335b3953c58

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

commit 4ce4bd7ed6f607a2bd875d90ddfdc585cedb30b0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Dec 15 19:02:59 2011 -0500

    Fix property names

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

http://git.horde.org/horde-git/-/commit/4ce4bd7ed6f607a2bd875d90ddfdc585cedb30b0

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

commit 247017bf10d9951f1f5cdf1b6e0a5bed30bb4153
Merge: 3fa2bda 4ce4bd7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 15 22:51:55 2011 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Date/lib/Horde/Date.php

 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php |   16 ++++-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php       |    4 +-
 framework/ActiveSync/package.xml                                  |   18 +++-
 framework/ActiveSync/test/Horde/ActiveSync/AppointmentTest.php    |   11 ++-
 framework/Date/lib/Horde/Date/Recurrence.php                      |    2 +-
 5 files changed, 37 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/247017bf10d9951f1f5cdf1b6e0a5bed30bb4153