[commits] Horde branch develop updated. 762c3b0d347244f16b06edc89bdc129c12e9eeb0

[Michael M Slusarz]

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

from: c10f12d808925dfb2fd5ef5ec3548b7934d9c837

0490ddb [mms] Added the 'delhide_trash' preference.
50ec54a More optimization of delhide determination
bcd8831 Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
e823af8 IMP 5 does not yet support hiding messages in threaded mailboxes
b57b811 Merge branch 'master' into develop
89bfa3b Somehow I already lost this code
762c3b0 Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

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

commit 0490ddbe652af6db485e5086a09f0ecda90203df
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 00:49:28 2012 -0600

    [mms] Added the 'delhide_trash' preference.

 imp/config/prefs.php |   16 +++++++++++++++-
 imp/docs/CHANGES     |    1 +
 imp/docs/UPGRADING   |   10 ++++++++++
 imp/lib/Mailbox.php  |    2 +-
 imp/package.xml      |    2 ++
 5 files changed, 29 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/0490ddbe652af6db485e5086a09f0ecda90203df

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

commit 50ec54af1b0819c74311c67e6424dd11391c4ebd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 11:19:54 2012 -0600

    More optimization of delhide determination
    
    Remove threaded check - we can hide deleted messages in thread sorts in
    IMP 6.
    
    No need to cache - adds complexity when computation is small/basic.

 imp/lib/Mailbox.php |   32 +++++++-------------------------
 1 files changed, 7 insertions(+), 25 deletions(-)

http://git.horde.org/horde-git/-/commit/50ec54af1b0819c74311c67e6424dd11391c4ebd

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

commit bcd88312afc3f4597b615fd56c70e3fcb501da99
Merge: 50ec54a 096577a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 11:28:32 2012 -0600

    Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

 ingo/blacklist.php |    1 -
 ingo/filters.php   |    6 +++-
 ingo/forward.php   |    9 ++---
 ingo/lib/Api.php   |   89 +++++++++++++++++++++++-----------------------------
 ingo/lib/Ingo.php  |   22 +++++++------
 ingo/rule.php      |    6 +++-
 ingo/script.php    |   15 ++++++--
 ingo/spam.php      |    8 ++---
 ingo/vacation.php  |    9 ++---
 ingo/whitelist.php |    1 -
 10 files changed, 81 insertions(+), 85 deletions(-)

http://git.horde.org/horde-git/-/commit/bcd88312afc3f4597b615fd56c70e3fcb501da99

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

commit e823af8a2f83c5bb69ccb3376572006b570ae0e2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 11:31:47 2012 -0600

    IMP 5 does not yet support hiding messages in threaded mailboxes

 imp/lib/Mailbox.php |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/e823af8a2f83c5bb69ccb3376572006b570ae0e2

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

commit b57b811d435a7300eec2c96e2babd596f8b45d93
Merge: bcd8831 e823af8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 11:33:53 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/docs/UPGRADING
    	imp/lib/Mailbox.php
    	imp/package.xml

 imp/config/prefs.php |   16 +++++++++++++++-
 imp/docs/CHANGES     |    1 +
 imp/docs/UPGRADING   |   10 ++++++++++
 imp/package.xml      |    1 +
 4 files changed, 27 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b57b811d435a7300eec2c96e2babd596f8b45d93

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

commit 89bfa3b35f7841ccf23a2680ac6e1dfde25eb8b0
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 11:34:58 2012 -0600

    Somehow I already lost this code

 imp/lib/Mailbox.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/89bfa3b35f7841ccf23a2680ac6e1dfde25eb8b0

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

commit 762c3b0d347244f16b06edc89bdc129c12e9eeb0
Merge: 89bfa3b c10f12d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Apr 5 11:36:18 2012 -0600

    Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop

 ingo/lib/Transport/Timsieved.php |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/762c3b0d347244f16b06edc89bdc129c12e9eeb0