[commits] Horde branch master updated. 31e7db22db70c09454a7e95156d024a3d18c4650

[Michael J. Rubinsky]

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

from: 2d27b93262cbe86bdb3a1f510808165087dc57ed

95e8def We might have ONLY failures too.
31e7db2 Try to work around issue on android with conflicts:

Summary: http://github.com/horde/horde/compare/2d27b93262cbe86bdb3a1f510808165087dc57ed...31e7db22db70c09454a7e95156d024a3d18c4650

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

commit 95e8deffec073ba0c78f5d3d8e220e216a4c6891
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 10:59:45 2013 -0400

    We might have ONLY failures too.

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/95e8deffec073ba0c78f5d3d8e220e216a4c6891
http://git.horde.org/horde-git/-/commit/95e8deffec073ba0c78f5d3d8e220e216a4c6891

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

commit 31e7db22db70c09454a7e95156d024a3d18c4650
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 12:12:15 2013 -0400

    Try to work around issue on android with conflicts:
    
    Ensure that any conflicts that result in server data overwritting
    client data, have the server data send as a MODIFY element in
    the same response as the conflict status code for the same message.

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php  |   25 +++++++++++-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php |   10 ++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/31e7db22db70c09454a7e95156d024a3d18c4650
http://git.horde.org/horde-git/-/commit/31e7db22db70c09454a7e95156d024a3d18c4650