[commits] Horde branch master updated. ce16adbbc099cd471c848b4ec8b5f1746f26ae4a

[Michael J. Rubinsky]

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

from: 21a8a3eba6f9f39e74b024d350c8269a206518bc

cdedff3 Kronolith_Driver::deleteEvent takes an id or Kronolith_Event now.
7c553db This can never be a string.
bc4085d Revert "This can never be a string."
c47a573 These objects can take a string in the const'r. Fix typehints.
6c9b2e1 More resource cleanup.
ce16adb Fix adding events when a resource calendar is present in display_calendars.

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

commit cdedff3a1150449a7e359838d76a828f889c0f3c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 18:23:15 2012 -0400

    Kronolith_Driver::deleteEvent takes an id or Kronolith_Event now.

 kronolith/lib/Driver.php              |    2 ++
 kronolith/lib/Driver/Ical.php         |    3 +++
 kronolith/lib/Driver/Kolab.php        |    3 +++
 kronolith/lib/Driver/Resource/Sql.php |    7 ++++++-
 4 files changed, 14 insertions(+), 1 deletions(-)

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

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

commit 7c553db6136c92f197f7007e24d04f7e9d5d605f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 19:57:56 2012 -0400

    This can never be a string.

 kronolith/lib/View/DeleteEvent.php |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/7c553db6136c92f197f7007e24d04f7e9d5d605f

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

commit bc4085d02edc48291ab6f2fe24b6ea669833084b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 20:08:16 2012 -0400

    Revert "This can never be a string."
    
    This reverts commit 7c553db6136c92f197f7007e24d04f7e9d5d605f.

 kronolith/lib/View/DeleteEvent.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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

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

commit c47a5738d3880f6dcfdbbf3fcaf8620e91257d36
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 20:10:38 2012 -0400

    These objects can take a string in the const'r. Fix typehints.

 kronolith/lib/View/DeleteEvent.php |    5 +++--
 kronolith/lib/View/EditEvent.php   |    5 +++--
 kronolith/lib/View/Event.php       |    5 +++--
 kronolith/lib/View/ExportEvent.php |    5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

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

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

commit 6c9b2e1a6191f58a50311bf307e09457a1be262d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 20:21:25 2012 -0400

    More resource cleanup.
    
    Fix deleting a resource event directly. Other cleanups.

 kronolith/delete.php                  |    2 +-
 kronolith/lib/Driver/Resource/Sql.php |   41 +++++++++++++++++++++++++--------
 kronolith/lib/Kronolith.php           |    4 +--
 3 files changed, 33 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/6c9b2e1a6191f58a50311bf307e09457a1be262d

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

commit ce16adbbc099cd471c848b4ec8b5f1746f26ae4a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 4 20:26:45 2012 -0400

    Fix adding events when a resource calendar is present in display_calendars.
    
    This is a left over from when we were only displaying resource calendars
    explicitly.

 kronolith/templates/edit/edit.inc |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

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