The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: dc5f2f9cfda9ae3662cf9acd19a3ca3ff0a91281 fb2cbce Put search field back in at least most Trean views 0785ed0 New Relic RUM support 0798d0e [mms] Don't display empty mailbox action for mailboxes when Virtual Trash is active (Bug #12162). 1ed696e Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit fb2cbce3ad4b464930818e16cf939206f6811d46 Author: Chuck Hagenbuch <[email protected]> Date: Sat Apr 6 09:46:18 2013 -0400 Put search field back in at least most Trean views trean/app/controllers/BrowseByTag.php | 6 ++++++ trean/browse.php | 6 ++++++ trean/edit.php | 6 ++++++ trean/search.php | 6 ++++++ 4 files changed, 24 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/fb2cbce3ad4b464930818e16cf939206f6811d46 ----------------------------------------------------------------------- commit 0785ed0b56f7ec11c3b5ee2076ea8e0e1741ffd4 Author: Chuck Hagenbuch <[email protected]> Date: Sat Apr 6 09:58:08 2013 -0400 New Relic RUM support horde/docs/CHANGES | 2 ++ horde/package.xml | 2 ++ horde/templates/common/footer.html.php | 1 + horde/templates/common/header.html.php | 1 + 4 files changed, 6 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/0785ed0b56f7ec11c3b5ee2076ea8e0e1741ffd4 ----------------------------------------------------------------------- commit 0798d0e0eb5407a67c7d577bdc93b779225dc4c5 Author: Michael M Slusarz <[email protected]> Date: Sat Apr 6 22:42:07 2013 -0600 [mms] Don't display empty mailbox action for mailboxes when Virtual Trash is active (Bug #12162). imp/docs/CHANGES | 2 ++ imp/lib/Mailbox.php | 8 +++++++- imp/package.xml | 2 ++ 3 files changed, 11 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/0798d0e0eb5407a67c7d577bdc93b779225dc4c5 ----------------------------------------------------------------------- commit 1ed696e0315d4c690054376be99ab8091a0112e8 Merge: dc5f2f9 0798d0e Author: Michael M Slusarz <[email protected]> Date: Sat Apr 6 22:58:28 2013 -0600 Merge branch 'master' into imp_6_1 Conflicts: imp/package.xml horde/docs/CHANGES | 2 ++ horde/package.xml | 2 ++ horde/templates/common/footer.html.php | 1 + horde/templates/common/header.html.php | 1 + imp/docs/CHANGES | 2 ++ imp/lib/Mailbox.php | 8 +++++++- imp/package.xml | 1 + trean/app/controllers/BrowseByTag.php | 6 ++++++ trean/browse.php | 6 ++++++ trean/edit.php | 6 ++++++ trean/search.php | 6 ++++++ 11 files changed, 40 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/1ed696e0315d4c690054376be99ab8091a0112e8 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
