The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 489c2f7b96065e6a650555328641ca1976dfc2e9 9c02c01 Fix migration script e3f1b45 Fix quoting. 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. 7cca121 More fixes upstream (tweaks to patches previously applied here) 4b9669a Better sanity checking for broken CSS bb43bfa Inform the user if broken CSS data exists in the message ab97e7f Convert non-period decimal points to periods fdd8f53 The phpdoc states this method can take IMP_Maillog:: constants. Make it so. 79cd0aa Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 9c02c01ef9a7ee85943515dc5870aac6c146456d Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 00:23:13 2013 -0600 Fix migration script I *think* SQL requires single quotes here instead of double quotes. At the very least, Postgres was erroring with this message: SQLSTATE[42703]: Undefined column: 7 ERROR: column "imp.%" does not exist imp/migration/3_imp_maillog_update.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/9c02c01ef9a7ee85943515dc5870aac6c146456d ----------------------------------------------------------------------- commit e3f1b45cca42f3688ac57ae155ea87a4850881bb Author: Jan Schneider <[email protected]> Date: Wed Mar 20 10:38:06 2013 +0100 Fix quoting. imp/migration/3_imp_maillog_update.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/e3f1b45cca42f3688ac57ae155ea87a4850881bb ----------------------------------------------------------------------- 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 7cca1217e9d0249e2cb2c426820e6a30ce0febdd Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 17:25:26 2013 -0600 More fixes upstream (tweaks to patches previously applied here) framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 75 ++++++----- framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php | 25 ++-- framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php | 9 +- 4 files changed, 60 insertions(+), 51 deletions(-) http://git.horde.org/horde-git/-/commit/7cca1217e9d0249e2cb2c426820e6a30ce0febdd ----------------------------------------------------------------------- commit 4b9669a12bef908d8ab39fc8271c406abee6b359 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 23:37:01 2013 -0600 Better sanity checking for broken CSS framework/Core/lib/Horde/Themes/Css.php | 11 +++++++++-- imp/lib/Contents/View.php | 21 +++++++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/4b9669a12bef908d8ab39fc8271c406abee6b359 ----------------------------------------------------------------------- commit bb43bfaacf184c254867971a1f7ee27fc7eba605 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 23:46:18 2013 -0600 Inform the user if broken CSS data exists in the message imp/lib/Mime/Viewer/Html.php | 56 +++++++++++++++++++++++++---------------- 1 files changed, 34 insertions(+), 22 deletions(-) http://git.horde.org/horde-git/-/commit/bb43bfaacf184c254867971a1f7ee27fc7eba605 ----------------------------------------------------------------------- commit ab97e7fca2e28911445abd1a0a81d63b9ac92dad Author: Michael M Slusarz <[email protected]> Date: Thu Mar 21 14:56:47 2013 -0600 Convert non-period decimal points to periods framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/ab97e7fca2e28911445abd1a0a81d63b9ac92dad ----------------------------------------------------------------------- commit fdd8f53f5a2f143b308a44c3256dacbd256ef88d Author: Michael J Rubinsky <[email protected]> Date: Fri Mar 22 01:07:44 2013 -0400 The phpdoc states this method can take IMP_Maillog:: constants. Make it so. imp/lib/Maillog.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/fdd8f53f5a2f143b308a44c3256dacbd256ef88d ----------------------------------------------------------------------- commit 79cd0aacca17e2188f8b04ad8ddf8823b2a0df82 Merge: 489c2f7 fdd8f53 Author: Michael J Rubinsky <[email protected]> Date: Fri Mar 22 01:10:07 2013 -0400 Merge branch 'master' into imp_6_1 Conflicts: imp/lib/Mime/Viewer/Html.php imp/migration/3_imp_maillog_update.php framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +- framework/Core/lib/Horde/Themes/Css.php | 11 ++- framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 75 ++++++----- framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php | 25 ++-- framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php | 12 +- framework/Css_Parser/package.xml | 7 - imp/lib/Compose.php | 3 +- imp/lib/Contents/View.php | 21 ++- imp/lib/Maillog.php | 5 + imp/lib/Mime/Viewer/Html.php | 55 +++++--- imp/migration/3_imp_maillog_update.php | 4 +- kronolith/docs/CHANGES | 3 + 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 | 4 + passwd/lib/Basic.php | 12 +- 19 files changed, 153 insertions(+), 110 deletions(-) http://git.horde.org/horde-git/-/commit/79cd0aacca17e2188f8b04ad8ddf8823b2a0df82 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
