[commits] Horde branch master updated. 61dfb8dbfb5c392b3a376f2e433a8906cd9388f3

[Michael Rubinsky]

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

from: 831a8a6f0771d3cab12c86c3c017786c5e9080dd

6bdc1c8 Don't overwrite the syncml partners
b7b77ff Allow specifying a user to filter on when querying partnered devices.
61dfb8d initial activesync device management pref screen.

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

commit 6bdc1c8156574f2460be79e1132e971dcd9b2f2e
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Wed Apr 28 20:03:26 2010 -0400

    Don't overwrite the syncml partners

 horde/lib/Prefs/Ui.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/horde/lib/Prefs/Ui.php?rt=horde-git&r1=a861b23f6c641b45228b9a8a2a8cf90e5013be5e&r2=6bdc1c8156574f2460be79e1132e971dcd9b2f2e

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

commit b7b77ffc9fdd75208b5842c69522ba1cc99d2001
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Apr 29 14:44:23 2010 -0400

    Allow specifying a user to filter on when querying partnered devices.

 framework/ActiveSync/lib/Horde/ActiveSync/State/History.php |   12 ++++++++--
 1 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php?rt=horde-git&r1=7f17d7198bffb8ba2847121f7cb15b1d31779b57&r2=b7b77ffc9fdd75208b5842c69522ba1cc99d2001

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

commit 61dfb8dbfb5c392b3a376f2e433a8906cd9388f3
Author: Michael J. Rubinsky <mrubinsk at horde.org>
Date:   Thu Apr 29 14:45:01 2010 -0400

    initial activesync device management pref screen.

 horde/lib/Prefs/Ui.php                |   73 ++++++++++++++++++++++++++++++++-
 horde/templates/prefs/activesync.html |   32 ++++++++++++++
 2 files changed, 104 insertions(+), 1 deletions(-)
 create mode 100644 horde/templates/prefs/activesync.html

http://git.horde.org/diff.php/horde/lib/Prefs/Ui.php?rt=horde-git&r1=6bdc1c8156574f2460be79e1132e971dcd9b2f2e&r2=61dfb8dbfb5c392b3a376f2e433a8906cd9388f3
http://git.horde.org/co.php/horde/templates/prefs/activesync.html?rt=horde-git&r=61dfb8dbfb5c392b3a376f2e433a8906cd9388f3