The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: c4692baa007d86e4cab90b6cd88081133eb7438f 36e7ff1 Obviously another botched merge 41c01f2 No need for private. Not sure why these were declared as such. dd9a153 Output an empty POOMCAL_MEETINGSTATUS property. ba28d99 Explicitly set the MEETING_NOT_MEETING value. c1f3c2d Don't convert to Ansel_Style here, no need for it at this point. 516e43f Fix blocking CSS elements in HTML messages 74a3d30 Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 36e7ff1905375765ee20a2e9a4833046b96da428 Author: Michael M Slusarz <[email protected]> Date: Tue Feb 19 23:00:14 2013 -0700 Obviously another botched merge imp/package.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/36e7ff1905375765ee20a2e9a4833046b96da428 ----------------------------------------------------------------------- commit 41c01f242be5fcf32318501a2a9d553ad4f91e70 Author: Michael J Rubinsky <[email protected]> Date: Wed Feb 20 01:05:02 2013 -0500 No need for private. Not sure why these were declared as such. ansel/lib/View/List.php | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/41c01f242be5fcf32318501a2a9d553ad4f91e70 ----------------------------------------------------------------------- commit dd9a153290c9ea407f60243624071c1d2c63873f Author: Michael J Rubinsky <[email protected]> Date: Wed Feb 20 01:05:28 2013 -0500 Output an empty POOMCAL_MEETINGSTATUS property. Possible fix for Bug: 12056 framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php | 16 +++++ 1 files changed, 16 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/dd9a153290c9ea407f60243624071c1d2c63873f ----------------------------------------------------------------------- commit ba28d99e6500abf09733f44d60d123ac17ed82fc Author: Michael J Rubinsky <[email protected]> Date: Wed Feb 20 01:06:04 2013 -0500 Explicitly set the MEETING_NOT_MEETING value. Possible fix for Bug: 12056 kronolith/lib/Event.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/ba28d99e6500abf09733f44d60d123ac17ed82fc ----------------------------------------------------------------------- commit c1f3c2df94e12862c9d63f83aa4ff47ff159f2f2 Author: Michael J Rubinsky <[email protected]> Date: Wed Feb 20 01:39:32 2013 -0500 Don't convert to Ansel_Style here, no need for it at this point. ansel/lib/Api.php | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/c1f3c2df94e12862c9d63f83aa4ff47ff159f2f2 ----------------------------------------------------------------------- commit 516e43fc32863aa8405b4740e16a472c643da191 Author: Michael M Slusarz <[email protected]> Date: Tue Feb 19 23:53:05 2013 -0700 Fix blocking CSS elements in HTML messages imp/lib/Mime/Viewer/Html.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/516e43fc32863aa8405b4740e16a472c643da191 ----------------------------------------------------------------------- commit 74a3d302cc980d5120de1f14849ebd0aa2905637 Merge: 36e7ff1 516e43f Author: Michael M Slusarz <[email protected]> Date: Tue Feb 19 23:54:02 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/lib/Mime/Viewer/Html.php ansel/lib/Api.php | 3 - ansel/lib/View/List.php | 20 ++-- framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php | 16 ++++ imp/lib/Mime/Viewer/Html.php | 8 +- kronolith/lib/Event.php | 2 + 5 files changed, 32 insertions(+), 17 deletions(-) http://git.horde.org/horde-git/-/commit/74a3d302cc980d5120de1f14849ebd0aa2905637 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
