[commits] Horde branch develop updated. 9985e238f6a1530c632957af23f64f86d3964724
Michael M Slusarz
slusarz at horde.org
Wed Dec 21 06:25:35 UTC 2011
The branch "develop" has been updated.
The following is a summary of the commits.
from: 88024a3a6288fbfb9a73f4b5b9f410f60dd085f7
3f2df94 [mms] Cache header object for message during page access.
d4ab092 Remove dead/unneeded code in test
4f131e5 Merge branch 'master' into develop
711b819 [mms] Need to cache gettext-enabled templates with language information in the cache ID (Bug #10872).
47f8fff Prepare for release
408d6d3 Released Horde_Template-1.0.1
b9aee53 Development mode for Horde_Template-1.0.2
9985e23 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit 3f2df94fc9b6f5aa1b0eaa371228f71f1eb4fa0b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 19:31:50 2011 -0700
[mms] Cache header object for message during page access.
imp/compose.php | 4 +-
imp/docs/CHANGES | 1 +
imp/lib/Ajax/Application.php | 17 +----
imp/lib/Compose.php | 16 ++--
imp/lib/Contents.php | 154 ++++++++++++++++++++++++++++++-----------
imp/lib/Filter.php | 3 +-
imp/lib/Message.php | 2 +-
imp/lib/Mime/Viewer/Html.php | 2 +-
imp/lib/Mime/Viewer/Itip.php | 6 +-
imp/lib/Mime/Viewer/Pgp.php | 6 +-
imp/lib/Mime/Viewer/Plain.php | 2 +-
imp/lib/Mime/Viewer/Smime.php | 2 +-
imp/lib/Spam.php | 2 +-
imp/lib/Ui/Imageview.php | 2 +-
imp/lib/Views/ShowMessage.php | 6 +--
imp/message-mimp.php | 7 +--
imp/message.php | 11 +--
imp/package.xml | 2 +
imp/view.php | 10 ++--
19 files changed, 155 insertions(+), 100 deletions(-)
http://git.horde.org/horde-git/-/commit/3f2df94fc9b6f5aa1b0eaa371228f71f1eb4fa0b
-----------------------------------------------------------------------
commit d4ab0924538a890e6281aa94e08c9318abc68e60
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 20:05:59 2011 -0700
Remove dead/unneeded code in test
framework/Support/test/Horde/Support/StringStreamTest.php | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/d4ab0924538a890e6281aa94e08c9318abc68e60
-----------------------------------------------------------------------
commit 4f131e5f6b188b07662968b4ffa6bc0b36d0e23f
Merge: 88024a3 d4ab092
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 20:41:06 2011 -0700
Merge branch 'master' into develop
Conflicts:
imp/package.xml
framework/Support/test/Horde/Support/StringStreamTest.php | 3 -
imp/compose.php | 4 +-
imp/docs/CHANGES | 1 +
imp/lib/Ajax/Application.php | 17 +-
imp/lib/Compose.php | 16 +-
imp/lib/Contents.php | 154 +++++++++----
imp/lib/Filter.php | 3 +-
imp/lib/Message.php | 2 +-
imp/lib/Mime/Viewer/Html.php | 2 +-
imp/lib/Mime/Viewer/Itip.php | 6 +-
imp/lib/Mime/Viewer/Pgp.php | 6 +-
imp/lib/Mime/Viewer/Plain.php | 2 +-
imp/lib/Mime/Viewer/Smime.php | 2 +-
imp/lib/Spam.php | 2 +-
imp/lib/Ui/Imageview.php | 2 +-
imp/lib/Views/ShowMessage.php | 6 +-
imp/message-mimp.php | 7 +-
imp/message.php | 11 +-
imp/package.xml | 1 +
imp/view.php | 10 +-
20 files changed, 154 insertions(+), 103 deletions(-)
http://git.horde.org/horde-git/-/commit/4f131e5f6b188b07662968b4ffa6bc0b36d0e23f
-----------------------------------------------------------------------
commit 711b8196d416995b2047c9a7ba5bf76981e59676
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 23:04:21 2011 -0700
[mms] Need to cache gettext-enabled templates with language information in the cache ID (Bug #10872).
framework/Template/lib/Horde/Template.php | 13 +++++++++++--
framework/Template/package.xml | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/711b8196d416995b2047c9a7ba5bf76981e59676
-----------------------------------------------------------------------
commit 47f8fff71983dd1f114654d88ed8210647747d71
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 23:06:53 2011 -0700
Prepare for release
framework/Template/package.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/47f8fff71983dd1f114654d88ed8210647747d71
-----------------------------------------------------------------------
commit 408d6d3c819ba4280d14ed2c7e5d0912206319b8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 23:16:28 2011 -0700
Released Horde_Template-1.0.1
framework/Template/package.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/408d6d3c819ba4280d14ed2c7e5d0912206319b8
-----------------------------------------------------------------------
commit b9aee53277ac88cecd022a0a0fb8be0af98c3269
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 23:16:28 2011 -0700
Development mode for Horde_Template-1.0.2
framework/Template/package.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/b9aee53277ac88cecd022a0a0fb8be0af98c3269
-----------------------------------------------------------------------
commit 9985e238f6a1530c632957af23f64f86d3964724
Merge: 4f131e5 b9aee53
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 20 23:25:11 2011 -0700
Merge branch 'master' into develop
framework/Template/lib/Horde/Template.php | 13 +++++++++++--
framework/Template/package.xml | 29 +++++++++++++++++++++++++----
2 files changed, 36 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/9985e238f6a1530c632957af23f64f86d3964724
More information about the commits
mailing list