[commits] Horde branch master updated. cad459b54d0a2ea63a0c6cb27ef4164199408205

[Michael M Slusarz]

The branch "master" has been updated.
The following is a summary of the commits.

from: a701ad0e6dc8421b591ed4e0e441acb7818ed8ec

2f4a517 Fixes to recent rules changes
cad459b Bug #13852: Fix display of delete-related options when using virtual trash

Summary: http://github.com/horde/horde/compare/a701ad0e6dc8421b591ed4e0e441acb7818ed8ec...cad459b54d0a2ea63a0c6cb27ef4164199408205

-----------------------------------------------------------------------

commit 2f4a5171f3ee1b130a19e7e9d3f15da836bfb83a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 24 23:22:42 2015 -0700

    Fixes to recent rules changes

 ingo/lib/Basic/Filters.php  |    2 +-
 ingo/lib/Basic/Rule.php     |    2 +-
 ingo/lib/Block/Overview.php |    2 +-
 ingo/lib/Storage.php        |   22 +++++++++++++++++-----
 ingo/lib/Storage/Sql.php    |    1 -
 5 files changed, 20 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/2f4a5171f3ee1b130a19e7e9d3f15da836bfb83a

-----------------------------------------------------------------------

commit cad459b54d0a2ea63a0c6cb27ef4164199408205
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 25 00:03:34 2015 -0700

    Bug #13852: Fix display of delete-related options when using virtual trash

 imp/js/base.js                            |   28 +++++++++++++++-------------
 imp/lib/Ajax/Application/ListMessages.php |   14 ++++++++++++--
 imp/lib/Dynamic/Mailbox.php               |    6 ------
 3 files changed, 27 insertions(+), 21 deletions(-)

http://github.com/horde/horde/commit/cad459b54d0a2ea63a0c6cb27ef4164199408205