The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 79cd0aacca17e2188f8b04ad8ddf8823b2a0df82 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. 76eed54 Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- 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 76eed544726c06a630e499e9620ca3b89483682f Merge: 79cd0aa fe7f7ca Author: Michael J Rubinsky <[email protected]> Date: Fri Mar 22 11:08:01 2013 -0400 Merge branch 'master' into imp_6_1 Conflicts: imp/lib/Compose.php imp/lib/Compose.php | 31 ++++++++++++++++--------------- 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 +++--- 6 files changed, 29 insertions(+), 19 deletions(-) http://git.horde.org/horde-git/-/commit/76eed544726c06a630e499e9620ca3b89483682f -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
