[commits] Horde branch nag_4_2 updated. 01cfdd1d1610effc4a581c99a6a01646530abf45

[Michael J. Rubinsky]

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

from: 0a2f38c165afd6264b0425bb08643e57870e8f5b

6504571 Simplify/cleanup device initialization.
131c692 Clean up SETTINGS request handling.
808b6bc Not sure why we were clearning the device_agent string here.
01cfdd1 Merge branch 'master' into nag_4_2

Summary: http://github.com/horde/horde/compare/0a2f38c165afd6264b0425bb08643e57870e8f5b...01cfdd1d1610effc4a581c99a6a01646530abf45

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

commit 65045710127d594ef15417a307061dbc9c6bcc73
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:30:45 2013 -0500

    Simplify/cleanup device initialization.

 framework/ActiveSync/lib/Horde/ActiveSync.php        |   48 ++++++++-------
 framework/ActiveSync/lib/Horde/ActiveSync/Device.php |   60 +++++++++++++----
 2 files changed, 72 insertions(+), 36 deletions(-)

http://github.com/horde/horde/commit/65045710127d594ef15417a307061dbc9c6bcc73
http://git.horde.org/horde-git/-/commit/65045710127d594ef15417a307061dbc9c6bcc73

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

commit 131c6928d01b2b99122b635370b7e19e8ba42f6b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:33:33 2013 -0500

    Clean up SETTINGS request handling.
    
    Specifically, better variable names, put version information in
    properties array.

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

http://github.com/horde/horde/commit/131c6928d01b2b99122b635370b7e19e8ba42f6b
http://git.horde.org/horde-git/-/commit/131c6928d01b2b99122b635370b7e19e8ba42f6b

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

commit 808b6bc668502ededee0699418b07b3c01bd121b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:35:20 2013 -0500

    Not sure why we were clearning the device_agent string here.
    
    This was causing the deviceAgent to vanish if SETTINGS was
    issued after a SYNC.

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

http://github.com/horde/horde/commit/808b6bc668502ededee0699418b07b3c01bd121b
http://git.horde.org/horde-git/-/commit/808b6bc668502ededee0699418b07b3c01bd121b

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

commit 01cfdd1d1610effc4a581c99a6a01646530abf45
Merge: 0a2f38c 808b6bc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:39:10 2013 -0500

    Merge branch 'master' into nag_4_2

 framework/ActiveSync/lib/Horde/ActiveSync.php                  |   48 +++---
 framework/ActiveSync/lib/Horde/ActiveSync/Device.php           |   60 ++++++--
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Settings.php |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php      |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php        |    3 +-
 5 files changed, 80 insertions(+), 45 deletions(-)

http://github.com/horde/horde/commit/01cfdd1d1610effc4a581c99a6a01646530abf45
http://git.horde.org/horde-git/-/commit/01cfdd1d1610effc4a581c99a6a01646530abf45