[commits] Horde branch imp_6_2 updated. 50981f4f0fb44451ac27bfb440fb771c75f1e17a

Michael M Slusarz slusarz at horde.org
Fri Oct 11 22:41:35 UTC 2013


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

from: 33dfbe8ea0a63f7d6bb27c1c4b9aafe07edb4c9e

df3d771 One more place this can be fixed.
f9c4b50 Fix fatal crash on sending back incoming sync conflict status. Bug #12755
2b2e53c BFN
2d27b93 Fix errors when the filter api is unavailable.
95e8def We might have ONLY failures too.
31e7db2 Try to work around issue on android with conflicts:
19efe8d Don't assume mail API is available.
2d91ec8 [mms] Explicitly reject XOAUTH2 as a authentication mechanism if it is not configured in the client (Bug #12756).
f5ce3cf Released Horde_Imap_Client-2.15.5
8ca460d Development mode for Horde_Imap_Client-2.15.6
22fe29e Fix global js var
50981f4 Merge branch 'master' into imp_6_2

Summary: http://github.com/horde/horde/compare/33dfbe8ea0a63f7d6bb27c1c4b9aafe07edb4c9e...50981f4f0fb44451ac27bfb440fb771c75f1e17a

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

commit df3d771ddb15bf97bb751ef57a6e22ec0488b3c7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 09:31:07 2013 -0400

    One more place this can be fixed.

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

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

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

commit f9c4b502d2dc49480c59d594bb2b3d153bcaa724
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date:   Fri Oct 11 12:46:46 2013 +0200

    Fix fatal crash on sending back incoming sync conflict status. Bug #12755
    
    Two PHP error message get fixed:
    PHP Fatal error:  Undefined class constant 'SYNC_CHANGE' in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 516
    PHP Fatal error:  Call to a member function content() on a non-object in /usr/share/pear/Horde/ActiveSync/Request/Sync.php on line 518
    
    Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>

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

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

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

commit 2b2e53c6f799d850a39bc2b351e145459642340b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 09:35:28 2013 -0400

    BFN

 framework/ActiveSync/package.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/2b2e53c6f799d850a39bc2b351e145459642340b
http://git.horde.org/horde-git/-/commit/2b2e53c6f799d850a39bc2b351e145459642340b

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

commit 2d27b93262cbe86bdb3a1f510808165087dc57ed
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 10:11:08 2013 -0400

    Fix errors when the filter api is unavailable.
    
    Bug: 12757

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Settings.php |   78 ++++----
 framework/ActiveSync/package.xml                               |    2 +
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php         |   14 ++-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php            |    4 +-
 framework/Core/package.xml                                     |    4 +-
 5 files changed, 61 insertions(+), 41 deletions(-)

http://github.com/horde/horde/commit/2d27b93262cbe86bdb3a1f510808165087dc57ed
http://git.horde.org/horde-git/-/commit/2d27b93262cbe86bdb3a1f510808165087dc57ed

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

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

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

commit 19efe8dac153be390c624d7e8de8ce4b3fde047c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 12:20:03 2013 -0400

    Don't assume mail API is available.
    
    Bug: 12738

 framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/19efe8dac153be390c624d7e8de8ce4b3fde047c
http://git.horde.org/horde-git/-/commit/19efe8dac153be390c624d7e8de8ce4b3fde047c

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

commit 2d91ec8bc09d3b28734422d735e5a447b48722bd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 11 16:07:41 2013 -0600

    [mms] Explicitly reject XOAUTH2 as a authentication mechanism if it is not configured in the client (Bug #12756).

 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |    2 +-
 framework/Imap_Client/package.xml                      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/2d91ec8bc09d3b28734422d735e5a447b48722bd
http://git.horde.org/horde-git/-/commit/2d91ec8bc09d3b28734422d735e5a447b48722bd

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

commit f5ce3cf9e5d50a8a20bd4390034a7f69256eb2c6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 11 16:19:56 2013 -0600

    Released Horde_Imap_Client-2.15.5

 framework/Imap_Client/package.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit 8ca460d14be35e7546e45f3b5469e988a2f1c194
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 11 16:19:56 2013 -0600

    Development mode for Horde_Imap_Client-2.15.6

 framework/Imap_Client/package.xml |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/8ca460d14be35e7546e45f3b5469e988a2f1c194
http://git.horde.org/horde-git/-/commit/8ca460d14be35e7546e45f3b5469e988a2f1c194

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

commit 22fe29efff82c2fb1914e088642561c8e922e5d3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 11 16:25:37 2013 -0600

    Fix global js var

 framework/Core/js/calendar.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/22fe29efff82c2fb1914e088642561c8e922e5d3
http://git.horde.org/horde-git/-/commit/22fe29efff82c2fb1914e088642561c8e922e5d3

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

commit 50981f4f0fb44451ac27bfb440fb771c75f1e17a
Merge: 33dfbe8 22fe29e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Oct 11 16:41:24 2013 -0600

    Merge branch 'master' into imp_6_2

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php      |   25 +++-
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php     |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Settings.php |   78 ++++----
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php     |   20 ++-
 framework/ActiveSync/package.xml                               |    6 +-
 framework/Core/js/calendar.js                                  |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php         |   14 ++-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php            |    4 +-
 framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php    |    6 +
 framework/Core/package.xml                                     |    4 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php         |    2 +-
 framework/Imap_Client/package.xml                              |   19 ++-
 12 files changed, 127 insertions(+), 56 deletions(-)

http://github.com/horde/horde/commit/50981f4f0fb44451ac27bfb440fb771c75f1e17a
http://git.horde.org/horde-git/-/commit/50981f4f0fb44451ac27bfb440fb771c75f1e17a




More information about the commits mailing list