The branch "caldav" has been updated. The following is a summary of the commits.
from: abb346a290c176bef84be1fbc0c1c03d48fc077a 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. 0902b95 Catch HTTP exceptions when trying to download external HTML resources. a0fe060 Better notification message if a task has been completed but is still incomplete due to recurrence. fe7f7ca [jan] Fix displaying of due dates of recurring events in basic list view. 1da0d96 Merge remote-tracking branch 'origin/master' into caldav ----------------------------------------------------------------------- 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 0902b95cd2ed8cede987da63df72530494405457 Author: Jan Schneider <[email protected]> Date: Wed Mar 20 11:59:18 2013 +0100 Catch HTTP exceptions when trying to download external HTML resources. imp/lib/Compose.php | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) http://git.horde.org/horde-git/-/commit/0902b95cd2ed8cede987da63df72530494405457 ----------------------------------------------------------------------- commit a0fe060f746ded2f63b9884624d8d3186173c505 Author: Jan Schneider <[email protected]> Date: Fri Mar 22 14:07:09 2013 +0100 Better notification message if a task has been completed but is still incomplete due to recurrence. nag/lib/CompleteTask.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/a0fe060f746ded2f63b9884624d8d3186173c505 ----------------------------------------------------------------------- commit fe7f7ca49f3e71a2e57b548236ee7c0355253d5c Author: Jan Schneider <[email protected]> Date: Fri Mar 22 14:59:18 2013 +0100 [jan] Fix displaying of due dates of recurring events in basic list view. nag/docs/CHANGES | 1 + nag/package.xml | 2 ++ nag/templates/list.html.php | 4 +++- nag/templates/list/_task.html.php | 6 +++--- 4 files changed, 9 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/fe7f7ca49f3e71a2e57b548236ee7c0355253d5c ----------------------------------------------------------------------- commit 1da0d968330055ef6fb2fd08ce56aed9dfb8e670 Merge: abb346a fe7f7ca Author: Jan Schneider <[email protected]> Date: Fri Mar 22 16:54:41 2013 +0100 Merge remote-tracking branch 'origin/master' into caldav 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 +- imp/lib/Compose.php | 28 +++-- imp/lib/Contents/View.php | 21 ++- imp/lib/Maillog.php | 5 + imp/lib/Mime/Viewer/Html.php | 56 +++++--- nag/docs/CHANGES | 1 + nag/lib/CompleteTask.php | 4 + nag/package.xml | 2 + nag/templates/list.html.php | 4 +- nag/templates/list/_task.html.php | 6 +- 14 files changed, 152 insertions(+), 100 deletions(-) http://git.horde.org/horde-git/-/commit/1da0d968330055ef6fb2fd08ce56aed9dfb8e670 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
