The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: e414f771ae91b9a1b0d2b02c289b12fe6b63260e 0da9ce9 Move text2html() to separate static section c40a438 phpdoc/optimize ce3abd3 Abstract compose file upload determination into IMP_Compose method 344aa59 [mms] Hide attachment upload UI in dynamic view if file uploads are disabled. d63cc9b Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 0da9ce93bb7e45b023806719942af518a13719c8 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 13:51:14 2013 -0700 Move text2html() to separate static section imp/lib/Compose.php | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) http://git.horde.org/horde-git/-/commit/0da9ce93bb7e45b023806719942af518a13719c8 ----------------------------------------------------------------------- commit c40a438af33822288f1f1b2515da34d277e5f915 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 13:51:19 2013 -0700 phpdoc/optimize imp/lib/Compose.php | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/c40a438af33822288f1f1b2515da34d277e5f915 ----------------------------------------------------------------------- commit ce3abd39f9c3ffed7261b46f69561daceeac5c6d Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 14:55:34 2013 -0700 Abstract compose file upload determination into IMP_Compose method imp/compose.php | 13 ++++++----- imp/lib/Ajax/Application/Handler/Dynamic.php | 24 +++++++++++++--------- imp/lib/Compose.php | 10 +++++++++ imp/lib/Minimal/Compose.php | 28 +++++++++++++------------ 4 files changed, 46 insertions(+), 29 deletions(-) http://git.horde.org/horde-git/-/commit/ce3abd39f9c3ffed7261b46f69561daceeac5c6d ----------------------------------------------------------------------- commit 344aa59ee8fe164b7897fa6b7ea976315f59a276 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 15:17:50 2013 -0700 [mms] Hide attachment upload UI in dynamic view if file uploads are disabled. imp/docs/CHANGES | 1 + imp/lib/Dynamic/Compose/Common.php | 13 ++++++++++--- imp/package.xml | 2 ++ imp/templates/dynamic/compose.html.php | 9 ++++++++- 4 files changed, 21 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/344aa59ee8fe164b7897fa6b7ea976315f59a276 ----------------------------------------------------------------------- commit d63cc9b74b32e68046244ba972f13179bfe3fbd0 Merge: e414f77 344aa59 Author: Michael M Slusarz <[email protected]> Date: Wed Jan 16 15:22:11 2013 -0700 Merge branch 'master' into imp_6_1 Conflicts: imp/compose.php imp/docs/CHANGES imp/lib/Dynamic/Compose/Common.php imp/package.xml imp/compose.php | 13 +++--- imp/docs/CHANGES | 1 + imp/lib/Ajax/Application/Handler/Dynamic.php | 24 ++++++----- imp/lib/Compose.php | 56 +++++++++++++++----------- imp/lib/Dynamic/Compose/Common.php | 15 ++++++- imp/lib/Minimal/Compose.php | 28 +++++++------ imp/package.xml | 1 + imp/templates/dynamic/compose.html.php | 9 ++++- 8 files changed, 91 insertions(+), 56 deletions(-) http://git.horde.org/horde-git/-/commit/d63cc9b74b32e68046244ba972f13179bfe3fbd0 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
