[commits] Horde branch horde_5_2 updated. a03a3c0d33d9235502b8ee4864eef443d179a0c0

[Michael J. Rubinsky]

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

from: c081ba0ec243511e714e9bd3138fdcc1e7e89151

3859fbd Log the error if we have it.
48de084 Fix the $and portion of the aggregation.
ae4ea3ae Fix handling event descriptions if they are provided in HTML/RTF.
43849e2 Merge branch 'master' into horde_5_2
e6c9fb6 Check incoming appointments for HTML body types.
a03a3c0 Merge branch 'master' into horde_5_2

Summary: http://github.com/horde/horde/compare/c081ba0ec243511e714e9bd3138fdcc1e7e89151...a03a3c0d33d9235502b8ee4864eef443d179a0c0

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

commit 3859fbd7914c963130d0499510bf651c29339012
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:17:14 2013 -0400

    Log the error if we have it.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/3859fbd7914c963130d0499510bf651c29339012
http://git.horde.org/horde-git/-/commit/3859fbd7914c963130d0499510bf651c29339012

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

commit 48de084df0dc5b34a7204a62edcdfa60d32b1de9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:17:37 2013 -0400

    Fix the $and portion of the aggregation.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/48de084df0dc5b34a7204a62edcdfa60d32b1de9
http://git.horde.org/horde-git/-/commit/48de084df0dc5b34a7204a62edcdfa60d32b1de9

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

commit ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:18:48 2013 -0400

    Fix handling event descriptions if they are provided in HTML/RTF.
    
    Possible fix for Bug: 12797

 kronolith/lib/Event.php |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65
http://git.horde.org/horde-git/-/commit/ae4ea3aeeb6a8ab6e7f5ed735682782ad3e0bf65

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

commit 43849e27a3cea5784692ba92e391ff39eee06d1e
Merge: c081ba0 ae4ea3ae
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:34:30 2013 -0400

    Merge branch 'master' into horde_5_2

 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   10 ++++--
 kronolith/lib/Event.php                                   |   21 ++++++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

http://github.com/horde/horde/commit/43849e27a3cea5784692ba92e391ff39eee06d1e
http://git.horde.org/horde-git/-/commit/43849e27a3cea5784692ba92e391ff39eee06d1e

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

commit e6c9fb68f0b7d0747169893fcf27b4414f3261cd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:40:23 2013 -0400

    Check incoming appointments for HTML body types.

 kronolith/lib/Event.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/e6c9fb68f0b7d0747169893fcf27b4414f3261cd
http://git.horde.org/horde-git/-/commit/e6c9fb68f0b7d0747169893fcf27b4414f3261cd

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

commit a03a3c0d33d9235502b8ee4864eef443d179a0c0
Merge: 43849e2 e6c9fb6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 27 23:41:04 2013 -0400

    Merge branch 'master' into horde_5_2

 kronolith/lib/Event.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/a03a3c0d33d9235502b8ee4864eef443d179a0c0
http://git.horde.org/horde-git/-/commit/a03a3c0d33d9235502b8ee4864eef443d179a0c0