The branch "nag_4_1" has been updated. The following is a summary of the commits.
from: d70ca70f59d4f38303b5fa3d84e21c0f95d32331 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. 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. 9aa1bf3 Use the default value of RANGE if not specified, as per the specs. 5167386 RANGE is optional in requests, don't assume it's there. 647ee01 Prepare for beta release fcf4dc9 Merge from upstream 9d126ef Bug #12124: Log details must be determined before queuing 125088d [jan] Fix default task list in portal block (Bug #12133). 81b68fd These elements can't be assumed to always be present. 4c184a3 [mms] Use more efficient date sorting algorithm as the default choice. 116e002 [mms] Fix ability to switch to non-default date sorting algorithm in dynamic view (Bug #12139). 822bc33 Better way of grabbing this information 6591167 Don't let a failure to validate a package cause a wsod. d0ad717 Merge branch 'master' into nag_4_1 ----------------------------------------------------------------------- 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 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 9aa1bf36cf2e6fae4e573dbd2bbf54994eb4686f Author: Michael J Rubinsky <[email protected]> Date: Fri Mar 22 15:45:47 2013 -0400 Use the default value of RANGE if not specified, as per the specs. framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/9aa1bf36cf2e6fae4e573dbd2bbf54994eb4686f ----------------------------------------------------------------------- commit 5167386800c625385a405eae8a3afcc02e640389 Author: Michael J Rubinsky <[email protected]> Date: Fri Mar 22 15:53:56 2013 -0400 RANGE is optional in requests, don't assume it's there. Conflicts: framework/Core/lib/Horde/Core/ActiveSync/Driver.php framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/5167386800c625385a405eae8a3afcc02e640389 ----------------------------------------------------------------------- commit 647ee01dffcb8b40c9d5bc66a6fe286d413169fb Author: Michael M Slusarz <[email protected]> Date: Thu Mar 21 19:18:00 2013 -0600 Prepare for beta release passwd/docs/RELEASE_NOTES | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/647ee01dffcb8b40c9d5bc66a6fe286d413169fb ----------------------------------------------------------------------- commit fcf4dc94d0ab87e875a6e2c97700466741f7f9d3 Author: Michael M Slusarz <[email protected]> Date: Sun Mar 24 16:10:13 2013 -0600 Merge from upstream commit 34fcc748a57ca601eb5dcc811c290a07a6def8bd Author: Raphael Schweikert <[email protected]> Date: Thu Mar 21 20:13:11 2013 +0100 Add more units and eliminate some duplicates see https://developer.mozilla.org/en-US/docs/CSS/length#Units framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/fcf4dc94d0ab87e875a6e2c97700466741f7f9d3 ----------------------------------------------------------------------- commit 9d126efcebf80f29a63f3ac001043361c532fc4d Author: Michael M Slusarz <[email protected]> Date: Sun Mar 24 16:29:18 2013 -0600 Bug #12124: Log details must be determined before queuing Since we are dealing with things like backtraces, this needs to be handled at the time the log request is made. As part of this, remove locale/TZ code from formatting code since it has no effect on the output (date() is both locale and TZ independent). framework/Core/lib/Horde.php | 19 +- framework/Core/lib/Horde/Core/Factory/Logger.php | 6 +- framework/Core/lib/Horde/Core/Log/Logger.php | 175 ++++----------- framework/Core/lib/Horde/Core/Log/Object.php | 265 ++++++++++++++++++++++ framework/Core/package.xml | 8 +- 5 files changed, 323 insertions(+), 150 deletions(-) create mode 100644 framework/Core/lib/Horde/Core/Log/Object.php http://git.horde.org/horde-git/-/commit/9d126efcebf80f29a63f3ac001043361c532fc4d ----------------------------------------------------------------------- commit 125088d433e9fffee555a060b289056aae1add7b Author: Jan Schneider <[email protected]> Date: Mon Mar 25 12:13:42 2013 +0100 [jan] Fix default task list in portal block (Bug #12133). nag/docs/CHANGES | 1 + nag/lib/Block/Summary.php | 2 +- nag/package.xml | 2 ++ 3 files changed, 4 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/125088d433e9fffee555a060b289056aae1add7b ----------------------------------------------------------------------- commit 81b68fdb774d75de29aa3373db64274a2a1c28ed Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 25 11:43:30 2013 -0400 These elements can't be assumed to always be present. ansel/js/views/common.js | 16 +++++++++++----- ansel/lib/View/GalleryRenderer/Base.php | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/81b68fdb774d75de29aa3373db64274a2a1c28ed ----------------------------------------------------------------------- commit 4c184a38944a62e3cbd892fe384eb3b80e0b3a42 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 25 17:30:15 2013 -0600 [mms] Use more efficient date sorting algorithm as the default choice. imp/config/prefs.php | 4 ++-- imp/docs/CHANGES | 1 + imp/lib/LoginTasks/SystemTask/Upgrade.php | 19 ++++++++++++++++++- imp/lib/Prefs/Sort/Sortpref.php | 2 +- imp/package.xml | 2 ++ imp/rss.php | 2 +- 6 files changed, 25 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/4c184a38944a62e3cbd892fe384eb3b80e0b3a42 ----------------------------------------------------------------------- commit 116e002681a7d298f1774a4495deb52efafca2f6 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 25 17:31:47 2013 -0600 [mms] Fix ability to switch to non-default date sorting algorithm in dynamic view (Bug #12139). imp/docs/CHANGES | 2 ++ imp/js/dimpbase.js | 9 ++++----- imp/lib/Ajax/Application/ListMessages.php | 2 +- imp/lib/Dynamic/Mailbox.php | 6 +++++- imp/package.xml | 2 ++ 5 files changed, 14 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/116e002681a7d298f1774a4495deb52efafca2f6 ----------------------------------------------------------------------- commit 822bc33374cfbc00fb945f7ce5ebbaefe78a8fcb Author: Michael M Slusarz <[email protected]> Date: Tue Mar 26 01:11:15 2013 -0600 Better way of grabbing this information framework/Util/lib/Horde/Domhtml.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/822bc33374cfbc00fb945f7ce5ebbaefe78a8fcb ----------------------------------------------------------------------- commit 65911673f27f3aa00cd9d56e81156d7d39c203f0 Author: Michael J Rubinsky <[email protected]> Date: Tue Mar 26 09:33:06 2013 -0400 Don't let a failure to validate a package cause a wsod. framework/Core/lib/Horde/Core/Db/Migration.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/65911673f27f3aa00cd9d56e81156d7d39c203f0 ----------------------------------------------------------------------- commit d0ad717e785a354bac96b251250ba03387f80975 Merge: d70ca70 6591167 Author: Michael J Rubinsky <[email protected]> Date: Tue Mar 26 09:48:30 2013 -0400 Merge branch 'master' into nag_4_1 Conflicts: nag/docs/CHANGES nag/package.xml nag/templates/list.html.php ansel/js/views/common.js | 16 +- ansel/lib/View/GalleryRenderer/Base.php | 2 + framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php | 1 + framework/Core/lib/Horde.php | 19 +- framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 13 +- framework/Core/lib/Horde/Core/Db/Migration.php | 4 + framework/Core/lib/Horde/Core/Factory/Logger.php | 6 +- framework/Core/lib/Horde/Core/Log/Logger.php | 175 ++----- framework/Core/lib/Horde/Core/Log/Object.php | 265 ++++++++++ framework/Core/lib/Horde/Themes/Css.php | 11 +- framework/Core/package.xml | 8 +- framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 75 ++-- framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/RuleSet.php | 4 +- 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 - framework/Util/lib/Horde/Domhtml.php | 4 +- imp/config/prefs.php | 4 +- imp/docs/CHANGES | 3 + imp/js/dimpbase.js | 9 +- imp/lib/Ajax/Application/ListMessages.php | 2 +- imp/lib/Compose.php | 31 +- imp/lib/Contents/View.php | 21 +- imp/lib/Dynamic/Mailbox.php | 6 +- imp/lib/LoginTasks/SystemTask/Upgrade.php | 19 +- imp/lib/Maillog.php | 5 + imp/lib/Mime/Viewer/Html.php | 56 ++- imp/lib/Prefs/Sort/Sortpref.php | 2 +- imp/package.xml | 4 + imp/rss.php | 2 +- 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 + nag/docs/CHANGES | 3 + nag/lib/Block/Summary.php | 2 +- nag/lib/CompleteTask.php | 4 + nag/package.xml | 2 + nag/templates/list.html.php | 8 +- nag/templates/list/_task.html.php | 6 +- passwd/docs/RELEASE_NOTES | 16 +- passwd/lib/Basic.php | 12 +- 45 files changed, 586 insertions(+), 309 deletions(-) http://git.horde.org/horde-git/-/commit/d0ad717e785a354bac96b251250ba03387f80975 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
