[commits] Horde branch master updated. f4d0606e8933c3fb54889fe58941dde2993e4950

[Jan Schneider]

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

from: 9288f044d74ccf118689eb72f092c1479baf7594

91ae561 Mark Kolab folders as default when changing default share preferences, without a hook.
f4d0606 Use default Kolab folders for default share preferences.

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

commit 91ae5618b23401729a27c4bac64d6a01327c3f84
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 4 15:50:58 2012 +0100

    Mark Kolab folders as default when changing default share preferences, without a hook.

 bundles/kolab_webmail/kronolith/config/hooks.php |   21 ---------------------
 bundles/kolab_webmail/mnemo/config/hooks.php     |   22 ----------------------
 bundles/kolab_webmail/nag/config/hooks.php       |   22 ----------------------
 bundles/kolab_webmail/turba/config/hooks.php     |   22 ----------------------
 kronolith/config/prefs.php                       |    3 +++
 kronolith/docs/CHANGES                           |    1 +
 kronolith/lib/Calendars/Base.php                 |    9 +++++++++
 kronolith/lib/Calendars/Kolab.php                |   21 +++++++++++++++++++++
 kronolith/package.xml                            |    2 ++
 mnemo/config/prefs.php                           |    5 +++++
 mnemo/docs/CHANGES                               |    1 +
 mnemo/lib/Notepads/Base.php                      |    9 +++++++++
 mnemo/lib/Notepads/Kolab.php                     |   21 +++++++++++++++++++++
 mnemo/package.xml                                |    4 ++--
 nag/config/prefs.php                             |    3 +++
 nag/docs/CHANGES                                 |    1 +
 nag/lib/Tasklists/Base.php                       |    9 +++++++++
 nag/lib/Tasklists/Kolab.php                      |   21 +++++++++++++++++++++
 nag/package.xml                                  |    4 ++--
 turba/config/prefs.php                           |    9 ++++++++-
 turba/docs/CHANGES                               |    2 ++
 turba/lib/Driver.php                             |    9 +++++++++
 turba/lib/Driver/Kolab.php                       |   21 +++++++++++++++++++++
 turba/package.xml                                |    4 ++--
 24 files changed, 152 insertions(+), 94 deletions(-)

http://git.horde.org/horde-git/-/commit/91ae5618b23401729a27c4bac64d6a01327c3f84

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

commit f4d0606e8933c3fb54889fe58941dde2993e4950
Author: Jan Schneider <jan at horde.org>
Date:   Tue Dec 4 20:55:09 2012 +0100

    Use default Kolab folders for default share preferences.

 bundles/kolab_webmail/kronolith/config/hooks.php |   38 ----------------------
 bundles/kolab_webmail/mnemo/config/hooks.php     |   37 ---------------------
 bundles/kolab_webmail/nag/config/hooks.php       |   37 ---------------------
 kronolith/docs/CHANGES                           |    1 +
 kronolith/lib/Calendars/Base.php                 |   19 +++++++++++
 kronolith/lib/Kronolith.php                      |   11 ++++++-
 kronolith/package.xml                            |    2 +
 mnemo/docs/CHANGES                               |    1 +
 mnemo/lib/Mnemo.php                              |   11 ++++++-
 mnemo/lib/Notepads/Base.php                      |   19 +++++++++++
 mnemo/package.xml                                |    2 +
 nag/docs/CHANGES                                 |    1 +
 nag/lib/Nag.php                                  |   11 ++++++-
 nag/lib/Tasklists/Base.php                       |   19 +++++++++++
 nag/package.xml                                  |    2 +
 15 files changed, 96 insertions(+), 115 deletions(-)
 delete mode 100644 bundles/kolab_webmail/kronolith/config/hooks.php
 delete mode 100644 bundles/kolab_webmail/mnemo/config/hooks.php
 delete mode 100644 bundles/kolab_webmail/nag/config/hooks.php

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