The branch "caldav" has been updated. The following is a summary of the commits.
from: b6cb50ebda9e07d16ed53d0bc53a3294b00d0ebe 5314dc4 Remove useless check. 9018edd Horde_Core is not required cb83850 Fix form variable names e0d5c67 Bug #12130: Need to also check if HTML is part ID 1, not just a child of part ID 1 98cb265 Fix undefined variable. ce6cd53 [jan] Only send update notifications for local calendars. c4119ef [jan] Don't send notifications for all recurrence exceptions when deleting events. abb346a Merge branch 'master' into caldav ----------------------------------------------------------------------- commit 5314dc4acac1ea347bfa1dabf62da6a31c484007 Author: Michael J Rubinsky <[email protected]> Date: Wed Mar 20 14:07:22 2013 -0400 Remove useless check. framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/5314dc4acac1ea347bfa1dabf62da6a31c484007 ----------------------------------------------------------------------- commit 9018edd6c07ac584801ec7664d9d322cde300960 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 15:07:10 2013 -0600 Horde_Core is not required framework/Css_Parser/package.xml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/9018edd6c07ac584801ec7664d9d322cde300960 ----------------------------------------------------------------------- commit cb838504fe3e091f401338b38ae94344474d0943 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 15:10:06 2013 -0600 Fix form variable names passwd/lib/Basic.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/cb838504fe3e091f401338b38ae94344474d0943 ----------------------------------------------------------------------- commit e0d5c67df3cb8062b3e21236b503c4c0af58e9ed Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 16:46:10 2013 -0600 Bug #12130: Need to also check if HTML is part ID 1, not just a child of part ID 1 imp/lib/Compose.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e0d5c67df3cb8062b3e21236b503c4c0af58e9ed ----------------------------------------------------------------------- commit 98cb2655e9a5e3bf67677da90484b16fdf566708 Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:11:26 2013 +0100 Fix undefined variable. kronolith/lib/Event.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/98cb2655e9a5e3bf67677da90484b16fdf566708 ----------------------------------------------------------------------- commit ce6cd53a1f792263664ffc66d23e23281b86ed92 Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:12:14 2013 +0100 [jan] Only send update notifications for local calendars. kronolith/docs/CHANGES | 1 + kronolith/lib/Driver.php | 5 ----- kronolith/lib/Driver/Kolab.php | 6 +++++- kronolith/lib/Driver/Sql.php | 5 +++++ kronolith/package.xml | 2 ++ 5 files changed, 13 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/ce6cd53a1f792263664ffc66d23e23281b86ed92 ----------------------------------------------------------------------- commit c4119efd1d520a72ca38d745a6eb65dd52689cad Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:13:03 2013 +0100 [jan] Don't send notifications for all recurrence exceptions when deleting events. kronolith/docs/CHANGES | 2 ++ kronolith/lib/Driver/Sql.php | 2 +- kronolith/package.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/c4119efd1d520a72ca38d745a6eb65dd52689cad ----------------------------------------------------------------------- commit abb346a290c176bef84be1fbc0c1c03d48fc077a Merge: b6cb50e c4119ef Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:17:04 2013 +0100 Merge branch 'master' into caldav Conflicts: kronolith/docs/CHANGES kronolith/package.xml framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +-- framework/Css_Parser/package.xml | 7 ---- imp/lib/Compose.php | 3 +- kronolith/docs/CHANGES | 11 +++++- kronolith/lib/Driver.php | 5 --- kronolith/lib/Driver/Kolab.php | 6 +++- kronolith/lib/Driver/Sql.php | 7 +++- kronolith/lib/Event.php | 1 + kronolith/package.xml | 22 ++++++++--- passwd/lib/Basic.php | 12 +++--- 10 files changed, 47 insertions(+), 32 deletions(-) http://git.horde.org/horde-git/-/commit/abb346a290c176bef84be1fbc0c1c03d48fc077a -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
