[commits] Horde branch develop updated. a211977cd603adb6c109a259a4fd771dc574d908

[Michael J. Rubinsky]

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

from: 404311cc707c76e6b321ef5760fd9c58a11e96ae

958daac Make this call BC (Bug #11197)
60ac41d Don't highlight today twice in the year view.
69d439d Revert "Allow to strip any message parts."
f13f130 [jan] Re-add option to report messages as spam/ham through redirection.
ee9d21e Bug: 11134 Fix moving subgalleries to to top level.
85c0667 BFN
a211977 Merge branch 'master' into develop

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

commit 958daacad7e1b85c539a9f5fc00b9fade123c645
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu May 31 12:00:42 2012 -0600

    Make this call BC (Bug #11197)

 ingo/lib/Script/Imap.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/958daacad7e1b85c539a9f5fc00b9fade123c645

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

commit 60ac41d1ee828a57a857ae4cae08a591a9f4a6fd
Author: Jan Schneider <jan at horde.org>
Date:   Tue May 29 19:30:58 2012 +0200

    Don't highlight today twice in the year view.

 kronolith/js/kronolith.js |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/60ac41d1ee828a57a857ae4cae08a591a9f4a6fd

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

commit 69d439d3de6ebc024ecdacb8f57e472baebe9d30
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jun 1 14:28:13 2012 +0200

    Revert "Allow to strip any message parts."
    
    This needs support in the stripping code too because we only support stripping
    base parts at the moment.
    
    This reverts commit 3cf43c1adff580632a4c5da4057e2089cf9707f7.

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

http://git.horde.org/horde-git/-/commit/69d439d3de6ebc024ecdacb8f57e472baebe9d30

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

commit f13f13083d82d1a51389c8f6b54b8050655c8cf8
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jun 1 16:13:32 2012 +0200

    [jan] Re-add option to report messages as spam/ham through redirection.

 imp/config/conf.xml |    8 +++++
 imp/docs/CHANGES    |    1 +
 imp/lib/Compose.php |   18 ++++++++-----
 imp/lib/Spam.php    |   72 ++++++++++++++++++++++++++++++--------------------
 imp/package.xml     |    2 +
 5 files changed, 65 insertions(+), 36 deletions(-)

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

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

commit ee9d21e35e4d152381f1a9b7761356df3912639e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jun 4 10:30:06 2012 -0400

    Bug: 11134 Fix moving subgalleries to to top level.

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

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

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

commit 85c0667f60538232133c422f89a0ae775e1acf88
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jun 4 10:47:42 2012 -0400

    BFN

 ansel/docs/CHANGES |    1 +
 ansel/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/85c0667f60538232133c422f89a0ae775e1acf88

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

commit a211977cd603adb6c109a259a4fd771dc574d908
Merge: 404311c 85c0667
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jun 4 11:14:23 2012 -0400

    Merge branch 'master' into develop
    
    Conflicts:
    	ansel/package.xml
    	imp/config/conf.xml
    	imp/lib/Compose.php
    	imp/lib/Spam.php

 ansel/docs/CHANGES        |    1 +
 ansel/lib/Gallery.php     |    2 +-
 ansel/package.xml         |    1 +
 imp/config/conf.xml       |    8 +++++
 imp/docs/CHANGES          |    1 +
 imp/lib/Compose.php       |   16 ++++++----
 imp/lib/Contents.php      |    3 +-
 imp/lib/Spam.php          |   71 +++++++++++++++++++++++++++-----------------
 imp/package.xml           |    2 +
 ingo/lib/Script/Imap.php  |    2 +-
 kronolith/js/kronolith.js |   11 +++++--
 11 files changed, 78 insertions(+), 40 deletions(-)

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