[commits] Horde branch develop updated. 36e555493bbf31faa3c8d7aca89905cf18a6f7ae

[Michael M Slusarz]

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

from: 3810ec816d0ac3f1d33955a6f5cb8f6214428e89

e72f75d Bug: 11209 Fix returning to gallery view after uploading images.
b182c07 Bug: 10889 Fix displaying carousel when viewing in iFrame
5fdd9c1 BFN
460d376 Bug #11197: Another BC fix
db87df8 Correctly build AND queries, implement strict searching (Bug #11207).
d0bf738 simplify
ad00dc1 [mms] Add Horde_String::trimUtf8Bom().
d4bbc9b [mms] Trim UTF-8 BOM from vCal data.
36e5554 Merge branch 'master' into develop

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

commit e72f75d56cb57f6192dbbdf79e7d1202be407f49
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jun 4 11:58:03 2012 -0400

    Bug: 11209 Fix returning to gallery view after uploading images.

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

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

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

commit b182c072c0e2e1ed4b7714e07d89d6ec7025d615
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jun 4 11:59:44 2012 -0400

    Bug: 10889 Fix displaying carousel when viewing in iFrame

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

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

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

commit 5fdd9c1dc460c57d0df5ceafa7ae253605f28a81
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Jun 4 12:02:15 2012 -0400

    BFN

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

http://git.horde.org/horde-git/-/commit/5fdd9c1dc460c57d0df5ceafa7ae253605f28a81

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

commit 460d3766089df6b20f0ec47d51ea27a0ef654fc7
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Jun 4 14:23:26 2012 -0600

    Bug #11197: Another BC fix

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

http://git.horde.org/horde-git/-/commit/460d3766089df6b20f0ec47d51ea27a0ef654fc7

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

commit db87df86571a87ed8c0ef19826e13caae939935a
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 5 11:06:27 2012 +0200

    Correctly build AND queries, implement strict searching (Bug #11207).

 turba/docs/CHANGES              |    1 +
 turba/lib/Driver/Favourites.php |   57 ++++++++++++++++++++++++++------------
 turba/package.xml               |    4 +-
 3 files changed, 42 insertions(+), 20 deletions(-)

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

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

commit d0bf738b1eb64236b67c42855f7245563dfbdaf1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jun 5 13:41:33 2012 -0600

    simplify

 framework/Util/lib/Horde/String.php |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

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

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

commit ad00dc150e0f3f6502ef9b69a9b2e6a0c03812c2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jun 5 13:44:34 2012 -0600

    [mms] Add Horde_String::trimUtf8Bom().

 framework/Util/lib/Horde/String.php |   16 ++++++++++++++++
 framework/Util/package.xml          |   14 +++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

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

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

commit d4bbc9be95c88553e041f9f7719fb90c014507ee
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jun 5 13:47:51 2012 -0600

    [mms] Trim UTF-8 BOM from vCal data.

 framework/Icalendar/lib/Horde/Icalendar.php |    2 +-
 framework/Icalendar/package.xml             |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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

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

commit 36e555493bbf31faa3c8d7aca89905cf18a6f7ae
Merge: 3810ec8 d4bbc9b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jun 5 13:49:24 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	ansel/package.xml
    	framework/Util/package.xml
    	turba/package.xml

 ansel/docs/CHANGES                          |    3 +
 ansel/img/upload.php                        |    2 +-
 ansel/lib/View/Upload.php                   |    2 +-
 ansel/package.xml                           |    2 +
 framework/Icalendar/lib/Horde/Icalendar.php |    2 +-
 framework/Icalendar/package.xml             |    6 +-
 framework/Util/lib/Horde/String.php         |   28 +++++++++----
 framework/Util/package.xml                  |    6 +-
 ingo/lib/Script/Imap.php                    |    2 +-
 turba/docs/CHANGES                          |    1 +
 turba/lib/Driver/Favourites.php             |   57 ++++++++++++++++++--------
 turba/package.xml                           |    2 +-
 12 files changed, 75 insertions(+), 38 deletions(-)

http://git.horde.org/horde-git/-/commit/36e555493bbf31faa3c8d7aca89905cf18a6f7ae