[commits] Horde branch master updated. ec7a55d13c3492e9b8d51bd4c9a3b529e785badf

Michael J. Rubinsky mrubinsk at horde.org
Tue Oct 22 14:16:47 UTC 2013


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

from: 851160de611d0d0f9d23a103271c25fbb7481498

5033ceb Simplify message data handling when building MIME message.
34d5ae8 phpdoc
18e4701 Use Horde_Stream_Temp
972013a No need to dereference the stream, Horde_Stream can handle it.
44197c0 Still need to return a resource.
15f9d3e Use Horde_Stream methods.
c2fd79e Horde_Stream#getString() does not work the way I thought.
96c587d Use Horde_Stream
da278d7 Typos.
81f9823 More places to use Horde_Stream
2a8159f Horde_Stream#read() doesn't exist
0f165a8 Typos
e780b3f Another typo
a90206a Fix merge.
c2a8a51 Horde_Stream#substream() feels more natural here.
ee85cd8 $this->_decoder->getStream() returns a Horde_Stream, not resource.
92d9dd7 Merge branch 'master' into as_streams
45e05b5 Merge branch 'master' into as_streams
8c3866c Merge branch 'master' into as_streams
48e4367 Merge branch 'master' into as_streams
97d471f Use more effecient object serialization.
0cfd4e1 Move to base class.
51a6abc Fix merge.
fe808b7 Update test to use Horde_Stream methods.
8e9965b Add Mongo driver for activesync state and tests.
555840d Add missing test file.
eccb6af Skip test if connection failed.
6ea723d Fix passing mongoclient to test.
5b03611 Move common properties to base class.
d97801f Abstract out ::_loadState() and move ::loadState to base class.
2a4564b More places to catch connection errors.
c4b11d2 Move ::isConflit() to base class.
020169e Catch exception
4c69d19 More functionality to move to the base class.
87f3ae7 Move getChanges() and related functionality to base class.
57217eb Add mongo indices.
b0ce0db Fix query definition.
50f3122 fix typo, remove cruft.
acc1a55 Easy way to gc the device collection.
f1907a8 Only save to backend if the data is dirty.
53cc3bc Need === here to avoid casting.
2904924 Disable state gc in the Mongo driver for now, something's broken.
4ec5622 Logging
bdaca8d Reduce this to one, maybe two, queries.
1c6488e phpdoc
03f35e8 This must be a string for the findOne call to match it.
67f3db0 Need a variable to return by ref.
8a8b548 The property might not exist, make sure we still set $_dirty.
5918f31 Merge branch 'master' into activesync_2_9_0
f098a5f This portion of the synckey is a leftover from zpush.
bf39141 Fix heredoc variable expansion.
1032ba0 No need for a separate device_id column, it's already the _id.
080844f Apparently this.{field_name} is not a string value. Fix matching the sync_key.
20e4e06 Re-enable GC now that mongo driver's implementation works.
3ec032b We need to treat policykey as a string value.
6212feb Add some logging.
1182ba6 Merge branch 'master' into activesync_2_9_0
9e84e53 Fix merge, this lives in the base class now.
0a7a617 Merge branch 'master' into activesync_2_9_0
b60897d Document the mongo schema.
b067ffb Allow only saving the sync_cache data that has actually changed.
0c32295 Update test
9c6d39f Can't get away with one query here. Need to purge other device_policykey entries.
337dad8 Simplify
71b28b6 More atomic tracking of dirty properties in device object.
8e6ff03 Only save the dirty data.
883c0c5 Fix dirty property tracking for SyncCache.
ced762b Merge branch 'master' into activesync_2_9_0
5b5d834 Ensure folderids are taken as strings.
bbd2344 Merge branch 'master' into activesync_2_9_0
6a01ec1 Merge branch 'master' into activesync_2_9_0
0e6f790 Force folderids to be strings, the easy way.
2c68023 Get rid of useless comment.
61289cc Ensure we have a synckey here as well.
e800d7f Refactor H_AS_State_Mongo::_getPIMChangeTS for recent changes.
3f8e4b3 Update base class
e48b6da Fix nesting.
9d4093c Implement _getMailmapChanges for Mongo driver.
36de5a5 Remove debug output.
bb70216 No longer used.
b7350cb Do not need to cast these, they are now always strings.
f1105f8 Add some logging to help see where data is being changed.
c9ea48b Use projections to limit the fields returned for SyncCache when possible.
73755b0 We only need sync_data here.
a38fa4b Only need 'users' here.
7e4fb52 Only need the _id here, not the data.
79ba96f Merge branch 'master' into activesync_2_9_0
3571dcb Add Horde_Mongo as optional dependency for Horde_ActiveSync
d870672 Fix tests.
1be10f8 Match function signatures.
8cded7f No reason not to restrict what is returned, even if we already have it.
b489d91 Add test for restricting fields returned from the syncCache query.
e2ce88c Merge branch 'master' into activesync_2_9_0
cfbbd68 Merge branch 'master' into activesync_2_9_0
4be8446 Typo
b640475 prefix the activesync mongo collections with HAS_
b10fbda This lives in the base class.
b70fc22 Add Horde_ActiveSync_State_Base::getFolderIdToBackendMap()
3a6a1a3 Use the uid map, and save tons of database calls to load the syncCache.
7ec9d26 Clean up some logging.
b741276 More logging improvements/cleanup.
7dcfdc3 Typo
538cc4f Merge branch 'master' into activesync_2_9_0
6aed361 More logging changes.
2d697fd Merge branch 'master' into activesync_2_9_0
88187a7 Merge branch 'master' into activesync_2_9_0
2c07b01 Changes, bump version.
ec7a55d Add test for mongo.

Summary: http://github.com/horde/horde/compare/851160de611d0d0f9d23a103271c25fbb7481498...ec7a55d13c3492e9b8d51bd4c9a3b529e785badf

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

commit 5033cebaa189b72af3902485ef38a630883d553e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 16:57:22 2013 -0400

    Simplify message data handling when building MIME message.
    
    Use Horde_Stream, only convert in one place, reduce memory usage.
    
    Conflicts:
    	framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php

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

http://github.com/horde/horde/commit/5033cebaa189b72af3902485ef38a630883d553e
http://git.horde.org/horde-git/-/commit/5033cebaa189b72af3902485ef38a630883d553e

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

commit 34d5ae813fdae302d230b3bb1b60af94c31167c3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 17:17:42 2013 -0400

    phpdoc

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

http://github.com/horde/horde/commit/34d5ae813fdae302d230b3bb1b60af94c31167c3
http://git.horde.org/horde-git/-/commit/34d5ae813fdae302d230b3bb1b60af94c31167c3

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

commit 18e47016a8a78393018164b6a0ad79ef45d6d625
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 17:31:56 2013 -0400

    Use Horde_Stream_Temp

 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php |   31 +++++++----
 1 files changed, 20 insertions(+), 11 deletions(-)

http://github.com/horde/horde/commit/18e47016a8a78393018164b6a0ad79ef45d6d625
http://git.horde.org/horde-git/-/commit/18e47016a8a78393018164b6a0ad79ef45d6d625

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

commit 972013a1fc12cbfe2376659ce041815134f879e9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 17:43:59 2013 -0400

    No need to dereference the stream, Horde_Stream can handle it.

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

http://github.com/horde/horde/commit/972013a1fc12cbfe2376659ce041815134f879e9
http://git.horde.org/horde-git/-/commit/972013a1fc12cbfe2376659ce041815134f879e9

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

commit 44197c06d7d672929b9037114a6c66e4ee865e11
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 17:44:24 2013 -0400

    Still need to return a resource.

 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/44197c06d7d672929b9037114a6c66e4ee865e11
http://git.horde.org/horde-git/-/commit/44197c06d7d672929b9037114a6c66e4ee865e11

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

commit 15f9d3ed3a6d817de5889e050c93c6fe3548ef60
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 17:55:29 2013 -0400

    Use Horde_Stream methods.

 framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/15f9d3ed3a6d817de5889e050c93c6fe3548ef60
http://git.horde.org/horde-git/-/commit/15f9d3ed3a6d817de5889e050c93c6fe3548ef60

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

commit c2fd79e3436178bbc8939a070681212d976a64aa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 18:43:50 2013 -0400

    Horde_Stream#getString() does not work the way I thought.

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

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

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

commit 96c587d94985b4438d6493000e5d4ead10c8db1e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 18:45:09 2013 -0400

    Use Horde_Stream
    
    Conflicts:
    	framework/ActiveSync/package.xml

 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php         |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php |    8 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php |   33 ++++-------
 framework/ActiveSync/package.xml                            |    6 +-
 4 files changed, 20 insertions(+), 29 deletions(-)

http://github.com/horde/horde/commit/96c587d94985b4438d6493000e5d4ead10c8db1e
http://git.horde.org/horde-git/-/commit/96c587d94985b4438d6493000e5d4ead10c8db1e

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

commit da278d7dd3299aa4b43f8d906fc666797730e1a3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 18:47:38 2013 -0400

    Typos.

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

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

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

commit 81f98230c5f07fbbade0fe07e410c4e4cbfd08cb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 29 18:53:06 2013 -0400

    More places to use Horde_Stream

 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |   10 +----
 .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php     |    5 +--
 2 files changed, 3 insertions(+), 12 deletions(-)

http://github.com/horde/horde/commit/81f98230c5f07fbbade0fe07e410c4e4cbfd08cb
http://git.horde.org/horde-git/-/commit/81f98230c5f07fbbade0fe07e410c4e4cbfd08cb

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

commit 2a8159fbbd5dcad36e951f909e4e81946e07d0c4
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Sep 30 14:57:07 2013 -0600

    Horde_Stream#read() doesn't exist

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php  |    3 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php        |    7 ++++---
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php |    6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

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

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

commit 0f165a860018af3b3b01d845874f71d3b3732c84
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Sep 30 15:19:12 2013 -0600

    Typos

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

http://github.com/horde/horde/commit/0f165a860018af3b3b01d845874f71d3b3732c84
http://git.horde.org/horde-git/-/commit/0f165a860018af3b3b01d845874f71d3b3732c84

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

commit e780b3fbfd2c177d49cfee548e906fda65623045
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Sep 30 15:42:55 2013 -0600

    Another typo

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

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

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

commit a90206aab9807f40685258c2951e1b2a37be998c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 1 18:32:38 2013 -0400

    Fix merge.

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

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

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

commit c2a8a51b7701fc2d979e822d767977b132dfd35b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 1 18:53:54 2013 -0400

    Horde_Stream#substream() feels more natural here.

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php  |    3 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php        |    4 ++--
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

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

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

commit ee85cd83598d1f934cf42e456da66ed4197f457e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 1 18:58:03 2013 -0400

    $this->_decoder->getStream() returns a Horde_Stream, not resource.
    
    Bug: 12727

 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |    6 +++-
 framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php               |    4 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

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

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

commit 92d9dd725c1159beb6c35739f26470fa80e26b6e
Merge: ee85cd8 08ef11f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 2 13:10:34 2013 -0400

    Merge branch 'master' into as_streams
    
    Conflicts:
    	framework/ActiveSync/package.xml

 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   27 +-
 .../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php      |   19 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php        |    2 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |    4 +-
 framework/ActiveSync/package.xml                                  |   14 +-
 framework/ActiveSync/test/Horde/ActiveSync/AutodiscoverTest.php   |  191 +++++
 framework/ActiveSync/test/Horde/ActiveSync/ServerTest.php         |    4 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    4 +
 framework/Css_Parser/lib/Sabberworm/CSS/Parser.php                |  106 ++-
 framework/Css_Parser/package.xml                                  |    4 +-
 framework/Stream/lib/Horde/Stream.php                             |    4 +-
 11 files changed, 306 insertions(+), 73 deletions(-)

http://github.com/horde/horde/commit/92d9dd725c1159beb6c35739f26470fa80e26b6e
http://git.horde.org/horde-git/-/commit/92d9dd725c1159beb6c35739f26470fa80e26b6e

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

commit 45e05b53f30d4f4b83761af6c064ff73d21fa38c
Merge: 92d9dd7 84b0cd5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 2 22:33:34 2013 -0400

    Merge branch 'master' into as_streams

 framework/Mongo/lib/Horde/Mongo/Client.php |   23 +++++++++++++++--------
 imp/js/dimpcore.js                         |    4 +++-
 ingo/lib/Basic/Rule.php                    |   25 ++++++++++++++-----------
 turba/lib/Driver.php                       |    4 +++-
 4 files changed, 35 insertions(+), 21 deletions(-)

http://github.com/horde/horde/commit/45e05b53f30d4f4b83761af6c064ff73d21fa38c
http://git.horde.org/horde-git/-/commit/45e05b53f30d4f4b83761af6c064ff73d21fa38c

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

commit 8c3866ce19f6d3eab6f572a7b1e742ad365d365e
Merge: 45e05b5 77652bc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 16:07:15 2013 -0400

    Merge branch 'master' into as_streams

 framework/Mongo/lib/Horde/Mongo/Client.php |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

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

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

commit 48e436768236233472de23261e1395c13883cc48
Merge: 8c3866c cceb2d8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 16:23:01 2013 -0400

    Merge branch 'master' into as_streams

 framework/Mongo/lib/Horde/Mongo/Client.php |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

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

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

commit 97d471f7f9bc946f78b5b8607128837425e9d7eb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 17:52:45 2013 -0400

    Use more effecient object serialization.

 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php |   41 ++++++-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php       |   10 +-
 2 files changed, 45 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/97d471f7f9bc946f78b5b8607128837425e9d7eb
http://git.horde.org/horde-git/-/commit/97d471f7f9bc946f78b5b8607128837425e9d7eb

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

commit 0cfd4e1cd6cda593d8dcb3a5c2f6e4525d746194
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 17:54:03 2013 -0400

    Move to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php |   10 +++++++++-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php  |    8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/0cfd4e1cd6cda593d8dcb3a5c2f6e4525d746194
http://git.horde.org/horde-git/-/commit/0cfd4e1cd6cda593d8dcb3a5c2f6e4525d746194

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

commit 51a6abcb1a73879ce6c0fa089d9b3530aea169d8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 17:54:51 2013 -0400

    Fix merge.

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

http://github.com/horde/horde/commit/51a6abcb1a73879ce6c0fa089d9b3530aea169d8
http://git.horde.org/horde-git/-/commit/51a6abcb1a73879ce6c0fa089d9b3530aea169d8

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

commit fe808b7d73f7664acafb0870d99507491c49360f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 17:56:39 2013 -0400

    Update test to use Horde_Stream methods.

 framework/ActiveSync/test/Horde/ActiveSync/AutodiscoverTest.php |    8 +++---
 1 files changed, 4 insertions(+), 4 deletions(-)

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

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

commit 8e9965bbe86610ee7bf9a480c694eac80d4567e6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 17:58:33 2013 -0400

    Add Mongo driver for activesync state and tests.
    
    Still to be considered beta, but is mostly working.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php     | 1618 +++++++++
 framework/ActiveSync/package.xml                              |    8 +-
 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php |   67 +-
 3 files changed, 1690 insertions(+), 3 deletions(-)
 create mode 100644 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php

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

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

commit 555840d5452edc3ff35ed9ebca8aab53e8d6fc4f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 17:59:29 2013 -0400

    Add missing test file.

 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |  220 +++++
 1 files changed, 220 insertions(+), 0 deletions(-)
 create mode 100644 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php

http://github.com/horde/horde/commit/555840d5452edc3ff35ed9ebca8aab53e8d6fc4f
http://git.horde.org/horde-git/-/commit/555840d5452edc3ff35ed9ebca8aab53e8d6fc4f

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

commit eccb6afb8c0ea78a540a583cfa917e7263f6dd84
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 18:41:25 2013 -0400

    Skip test if connection failed.

 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |    6 ++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

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

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

commit 6ea723dd8018362cf2a3d34aee3e263c031ff589
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:02:07 2013 -0400

    Fix passing mongoclient to test.

 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/6ea723dd8018362cf2a3d34aee3e263c031ff589
http://git.horde.org/horde-git/-/commit/6ea723dd8018362cf2a3d34aee3e263c031ff589

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

commit 5b03611bcf2a9f33f5a0d6baf59d86201764cefb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:04:00 2013 -0400

    Move common properties to base class.

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

http://github.com/horde/horde/commit/5b03611bcf2a9f33f5a0d6baf59d86201764cefb
http://git.horde.org/horde-git/-/commit/5b03611bcf2a9f33f5a0d6baf59d86201764cefb

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

commit d97801fbe814a5c36af0fd9445a28490042f7208
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:04:27 2013 -0400

    Abstract out ::_loadState() and move ::loadState to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |   77 +++++++++++--
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   55 +---------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   59 +---------
 3 files changed, 73 insertions(+), 118 deletions(-)

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

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

commit 2a4564be36f97d94a65402e27f2087bbe2e1d0f4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:11:38 2013 -0400

    More places to catch connection errors.

 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |   25 +++--
 1 files changed, 15 insertions(+), 10 deletions(-)

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

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

commit c4b11d22a95443e22cbe701582427811786ffe72
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:12:47 2013 -0400

    Move ::isConflit() to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |   39 +++++++++----
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   27 ---------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   27 ---------
 3 files changed, 27 insertions(+), 66 deletions(-)

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

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

commit 020169e32600ff059288db2ecb90e355da112587
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:16:26 2013 -0400

    Catch exception

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

http://github.com/horde/horde/commit/020169e32600ff059288db2ecb90e355da112587
http://git.horde.org/horde-git/-/commit/020169e32600ff059288db2ecb90e355da112587

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

commit 4c69d19b17a135b85de5e5a7879b98da505c8a8c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:41:09 2013 -0400

    More functionality to move to the base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |  104 +++++++++++--
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   54 +-------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   52 ------
 3 files changed, 90 insertions(+), 120 deletions(-)

http://github.com/horde/horde/commit/4c69d19b17a135b85de5e5a7879b98da505c8a8c
http://git.horde.org/horde-git/-/commit/4c69d19b17a135b85de5e5a7879b98da505c8a8c

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

commit 87f3ae793bfcf22060de573ee80528caa23add74
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 19:53:26 2013 -0400

    Move getChanges() and related functionality to base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |  230 ++++++++++++-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |  202 -----------
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |  202 -----------
 3 files changed, 218 insertions(+), 416 deletions(-)

http://github.com/horde/horde/commit/87f3ae793bfcf22060de573ee80528caa23add74
http://git.horde.org/horde-git/-/commit/87f3ae793bfcf22060de573ee80528caa23add74

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

commit 57217eb9a9403254e9ea34a19100cbf453fa58d4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 22:47:20 2013 -0400

    Add mongo indices.

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

http://github.com/horde/horde/commit/57217eb9a9403254e9ea34a19100cbf453fa58d4
http://git.horde.org/horde-git/-/commit/57217eb9a9403254e9ea34a19100cbf453fa58d4

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

commit b0ce0db9bd604cbdf086faf9b50e12277ae61f44
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 22:48:17 2013 -0400

    Fix query definition.

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

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

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

commit 50f312227f7c0640cf5e1804bc83d3e45cf25bbe
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 22:48:43 2013 -0400

    fix typo, remove cruft.

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

http://github.com/horde/horde/commit/50f312227f7c0640cf5e1804bc83d3e45cf25bbe
http://git.horde.org/horde-git/-/commit/50f312227f7c0640cf5e1804bc83d3e45cf25bbe

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

commit acc1a55c1b4c5437d92848ece9657eceb9ab6174
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 22:59:45 2013 -0400

    Easy way to gc the device collection.

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

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

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

commit f1907a89dde9b66dd59f0cc70a0ebe8e743f8615
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 3 23:18:39 2013 -0400

    Only save to backend if the data is dirty.

 framework/ActiveSync/lib/Horde/ActiveSync/Device.php |   25 +++++++++++++++---
 1 files changed, 21 insertions(+), 4 deletions(-)

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

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

commit 53cc3bc70fa705bf7a837bcfa436d1f8d2ea672a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:14:07 2013 -0400

    Need === here to avoid casting.

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

http://github.com/horde/horde/commit/53cc3bc70fa705bf7a837bcfa436d1f8d2ea672a
http://git.horde.org/horde-git/-/commit/53cc3bc70fa705bf7a837bcfa436d1f8d2ea672a

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

commit 29049247a25310e7695234b290502937f6c93764
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:14:28 2013 -0400

    Disable state gc in the Mongo driver for now, something's broken.

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

http://github.com/horde/horde/commit/29049247a25310e7695234b290502937f6c93764
http://git.horde.org/horde-git/-/commit/29049247a25310e7695234b290502937f6c93764

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

commit 4ec5622b316aa7614114fd628e4aa2341f99d745
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:15:05 2013 -0400

    Logging

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

http://github.com/horde/horde/commit/4ec5622b316aa7614114fd628e4aa2341f99d745
http://git.horde.org/horde-git/-/commit/4ec5622b316aa7614114fd628e4aa2341f99d745

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

commit bdaca8df66a45f1cc0dc6339bed389be6422a513
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:15:27 2013 -0400

    Reduce this to one, maybe two, queries.

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

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

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

commit 1c6488e2eb3680be5c09df0a5a1348dfe3300dae
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:36:17 2013 -0400

    phpdoc

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

http://github.com/horde/horde/commit/1c6488e2eb3680be5c09df0a5a1348dfe3300dae
http://git.horde.org/horde-git/-/commit/1c6488e2eb3680be5c09df0a5a1348dfe3300dae

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

commit 03f35e8f53400391f5166474224be0da1f19a33a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:36:44 2013 -0400

    This must be a string for the findOne call to match it.

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

http://github.com/horde/horde/commit/03f35e8f53400391f5166474224be0da1f19a33a
http://git.horde.org/horde-git/-/commit/03f35e8f53400391f5166474224be0da1f19a33a

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

commit 67f3db03f969707536bb23496c27ed552fa7e820
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:41:11 2013 -0400

    Need a variable to return by ref.

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

http://github.com/horde/horde/commit/67f3db03f969707536bb23496c27ed552fa7e820
http://git.horde.org/horde-git/-/commit/67f3db03f969707536bb23496c27ed552fa7e820

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

commit 8a8b548757d31d2f479a7138bf3c6cd6fe201120
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 4 00:41:24 2013 -0400

    The property might not exist, make sure we still set $_dirty.

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

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

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

commit 5918f31b46f512ac51eb85c65a7b893ce86159ce
Merge: 8a8b548 01accaf
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 09:57:44 2013 -0400

    Merge branch 'master' into activesync_2_9_0
    
    Conflicts:
    	framework/ActiveSync/package.xml

 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php        |    4 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php      |   23 +-
 framework/ActiveSync/package.xml                                  |   23 +-
 framework/Cache/lib/Horde/Cache/Storage/Apc.php                   |    1 -
 framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php          |    1 -
 framework/Cache/lib/Horde/Cache/Storage/Xcache.php                |    3 +-
 framework/Cache/package.xml                                       |   22 +-
 framework/Core/lib/Horde/Config.php                               |    2 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |   30 +-
 framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter/Pretty.php |    4 +-
 framework/Core/lib/Horde/Core/Factory/HttpClient.php              |    2 +-
 framework/Core/package.xml                                        |   28 +-
 framework/Release/lib/Horde/Release/Whups.php                     |    2 +-
 framework/Rpc/lib/Horde/Rpc/Jsonrpc.php                           |    2 +-
 framework/Rpc/lib/Horde/Rpc/Phpgw.php                             |    2 +-
 framework/Rpc/lib/Horde/Rpc/Xmlrpc.php                            |    2 +-
 .../Service_Facebook/lib/Horde/Service/Facebook/Request/Graph.php |    6 +-
 framework/Service_Gravatar/lib/Horde/Service/Gravatar.php         |  107 +++--
 framework/Service_Gravatar/package.xml                            |   13 +
 .../Service_Gravatar/test/Horde/Service/Gravatar/GravatarTest.php |   35 +-
 .../Service_Gravatar/test/Horde/Service/Gravatar/ServerTest.php   |   35 +-
 horde/js/logintasks-jquery.js                                     |    7 +
 horde/templates/logintasks/smartmobile.html.php                   |    2 +-
 imp/lib/Prefs/Special/PgpPrivateKey.php                           |    2 +-
 imp/package.xml                                                   |    2 +-
 kronolith/config/prefs.php                                        |    6 +-
 kronolith/js/kronolith.js                                         |    2 +-
 kronolith/lib/FreeBusy.php                                        |    2 +-
 kronolith/lib/Storage/Kolab.php                                   |    2 +-
 turba/docs/CHANGES                                                |    1 +
 turba/lib/Driver/Facebook.php                                     |   35 +-
 turba/package.xml                                                 |    2 +
 whups/bin/whups-git-hook                                          |    2 +-
 whups/bin/whups-svn-hook                                          |    2 +-
 34 files changed, 248 insertions(+), 166 deletions(-)

http://github.com/horde/horde/commit/5918f31b46f512ac51eb85c65a7b893ce86159ce
http://git.horde.org/horde-git/-/commit/5918f31b46f512ac51eb85c65a7b893ce86159ce

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

commit f098a5ff031b25b26c74a96e00a7d1f5ab6359e3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 10:04:57 2013 -0400

    This portion of the synckey is a leftover from zpush.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |    8 ++++----
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |    6 +++---
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

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

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

commit bf39141d94379717e56f747dd08f6ad28e51a7f5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 10:12:55 2013 -0400

    Fix heredoc variable expansion.

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

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

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

commit 1032ba04f57c0d5e87c5283cd810521d18c74110
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 10:28:17 2013 -0400

    No need for a separate device_id column, it's already the _id.

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

http://github.com/horde/horde/commit/1032ba04f57c0d5e87c5283cd810521d18c74110
http://git.horde.org/horde-git/-/commit/1032ba04f57c0d5e87c5283cd810521d18c74110

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

commit 080844f39fdf5b33da0a1283082773c0435f85aa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 11:10:21 2013 -0400

    Apparently this.{field_name} is not a string value. Fix matching the sync_key.

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

http://github.com/horde/horde/commit/080844f39fdf5b33da0a1283082773c0435f85aa
http://git.horde.org/horde-git/-/commit/080844f39fdf5b33da0a1283082773c0435f85aa

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

commit 20e4e069fc2cf7f6bb703f5ea2980f8cb6c8382d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 11:12:02 2013 -0400

    Re-enable GC now that mongo driver's implementation works.

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

http://github.com/horde/horde/commit/20e4e069fc2cf7f6bb703f5ea2980f8cb6c8382d
http://git.horde.org/horde-git/-/commit/20e4e069fc2cf7f6bb703f5ea2980f8cb6c8382d

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

commit 3ec032b82fdda48965fa517874cbd671dd826ce5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 11:12:39 2013 -0400

    We need to treat policykey as a string value.

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

http://github.com/horde/horde/commit/3ec032b82fdda48965fa517874cbd671dd826ce5
http://git.horde.org/horde-git/-/commit/3ec032b82fdda48965fa517874cbd671dd826ce5

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

commit 6212febcd4381e2091b8fdd2c4d4997deca3d93c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 11:14:52 2013 -0400

    Add some logging.

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

http://github.com/horde/horde/commit/6212febcd4381e2091b8fdd2c4d4997deca3d93c
http://git.horde.org/horde-git/-/commit/6212febcd4381e2091b8fdd2c4d4997deca3d93c

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

commit 1182ba625afd2e89ab2449ddce8bbcac9d944d31
Merge: 6212feb 5351814
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 13:07:32 2013 -0400

    Merge branch 'master' into activesync_2_9_0

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

http://github.com/horde/horde/commit/1182ba625afd2e89ab2449ddce8bbcac9d944d31
http://git.horde.org/horde-git/-/commit/1182ba625afd2e89ab2449ddce8bbcac9d944d31

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

commit 9e84e538e24acfbe1c444ff872767485481a632a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 8 13:08:27 2013 -0400

    Fix merge, this lives in the base class now.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |   19 ---------------
 1 files changed, 0 insertions(+), 19 deletions(-)

http://github.com/horde/horde/commit/9e84e538e24acfbe1c444ff872767485481a632a
http://git.horde.org/horde-git/-/commit/9e84e538e24acfbe1c444ff872767485481a632a

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

commit 0a7a617ea0bcddbe556a1b66a67fb4cc57db319b
Merge: 9e84e53 19efe8d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 13:05:09 2013 -0400

    Merge branch 'master' into activesync_2_9_0
    
    Conflicts:
    	framework/ActiveSync/package.xml

 ansel/lib/Test.php                                                |    9 -
 ansel/templates/tile/image.html.php                               |    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                                  |    3 +-
 framework/Core/js/hordecore.js                                    |   17 +-
 framework/Core/lib/Horde/Config.php                               |    4 +
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php            |   14 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    4 +-
 framework/Core/lib/Horde/Core/Ajax/Response/HordeCore.php         |   49 +++-
 framework/Core/lib/Horde/Core/Block/Layout.php                    |    4 +-
 framework/Core/lib/Horde/Core/Block/Layout/Manager.php            |    2 +-
 framework/Core/lib/Horde/Core/Factory/ActiveSyncBackend.php       |    6 +
 framework/Core/lib/Horde/Core/Factory/ThemesCache.php             |    8 +-
 framework/Core/lib/Horde/Core/Notification/Event/Status.php       |    2 +-
 framework/Core/lib/Horde/Core/Perms/Ui.php                        |   16 +-
 framework/Core/lib/Horde/Core/Prefs/Ui.php                        |    6 +-
 framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php                |    8 +-
 framework/Core/lib/Horde/Core/Text/Filter/Emoticons.php           |    8 +-
 framework/Core/lib/Horde/Core/Topbar.php                          |   23 ++
 framework/Core/lib/Horde/Core/Ui/FlagImage.php                    |    5 +-
 framework/Core/lib/Horde/Core/Ui/Tabs.php                         |    2 +-
 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php             |   44 ++--
 framework/Core/lib/Horde/Core/View/Helper/Image.php               |   11 +-
 framework/Core/lib/Horde/Help.php                                 |    2 +-
 framework/Core/lib/Horde/PageOutput.php                           |    8 +-
 framework/Core/lib/Horde/Themes/Cache.php                         |   11 +-
 framework/Core/lib/Horde/Themes/Css.php                           |    8 +-
 framework/Core/package.xml                                        |   20 +-
 framework/Imap_Client/package.xml                                 |   22 +-
 .../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php  |   75 +++--
 framework/Text_Filter/package.xml                                 |   22 +-
 gollem/lib/Test.php                                               |   19 +-
 horde/docs/CHANGES                                                |    1 +
 horde/js/sidebar.js                                               |    4 +-
 horde/js/topbar.js                                                |   31 +-
 horde/lib/Ajax/Application/Handler.php                            |   56 +++-
 horde/lib/Test.php                                                |   12 +-
 horde/lib/View/Topbar.php                                         |   22 +-
 horde/package.xml                                                 |   12 +-
 horde/themes/default/graphics/php.png                             |  Bin 0 -> 327 bytes
 horde/themes/default/screen.css                                   |   11 +-
 imp/js/dimpbase.js                                                |    8 +
 imp/lib/Ajax/Application/Handler/Common.php                       |   23 +-
 imp/lib/Ajax/Application/ListMessages.php                         |   44 +--
 imp/lib/Ajax/Queue.php                                            |   44 +++-
 imp/lib/Basic/Mailbox.php                                         |    5 +-
 imp/lib/Basic/Thread.php                                          |    7 +
 imp/lib/Flags.php                                                 |   19 +
 imp/lib/Images.php                                                |    9 +-
 imp/lib/Mime/Viewer/Html.php                                      |    1 +
 imp/lib/Test.php                                                  |   37 +--
 ingo/lib/Test.php                                                 |   22 +-
 jonah/lib/Test.php                                                |    9 -
 kronolith/lib/Test.php                                            |   18 +-
 passwd/config/conf.xml                                            |   14 +-
 passwd/lib/Test.php                                               |   15 +-
 turba/docs/CHANGES                                                |    2 +
 turba/js/search.js                                                |   20 +-
 turba/lib/Application.php                                         |    8 +-
 turba/lib/Form/Contact.php                                        |    8 +-
 turba/lib/Form/EditContact.php                                    |    5 +-
 turba/lib/Object.php                                              |   40 ++-
 turba/lib/Test.php                                                |   21 +-
 turba/package.xml                                                 |    4 +
 turba/search.php                                                  |    5 +
 turba/templates/search/footer.html.php                            |    3 +-
 turba/templates/search/header.html.php                            |   10 +-
 turba/templates/search/vbook.html.php                             |    1 -
 turba/themes/default/screen.css                                   |    7 +
 turba/view.php                                                    |    6 +-
 ulaform/lib/Test.php                                              |   11 +-
 vilma/lib/Test.php                                                |    9 -
 wicked/lib/Test.php                                               |    9 -
 76 files changed, 719 insertions(+), 434 deletions(-)

http://github.com/horde/horde/commit/0a7a617ea0bcddbe556a1b66a67fb4cc57db319b
http://git.horde.org/horde-git/-/commit/0a7a617ea0bcddbe556a1b66a67fb4cc57db319b

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

commit b60897de44c81e06c49b0f42a33af19d82763f7c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 14:04:54 2013 -0400

    Document the mongo schema.
    
    (State is still a work in progress, waiting to document).

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

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

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

commit b067ffb3457b87c397a83f76009a7be7ff3715d1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 16:28:16 2013 -0400

    Allow only saving the sync_cache data that has actually changed.
    
    Mostly for improved Mongo driver performance.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   36 +++++-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php   |   77 ++++++++++---
 4 files changed, 97 insertions(+), 22 deletions(-)

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

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

commit 0c322951e011eda0c201701299a6875128bbcfed
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 16:30:39 2013 -0400

    Update test

 framework/ActiveSync/test/Horde/ActiveSync/CacheTest.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/0c322951e011eda0c201701299a6875128bbcfed
http://git.horde.org/horde-git/-/commit/0c322951e011eda0c201701299a6875128bbcfed

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

commit 9c6d39fd2759bdf791e6a2b81dfe9055541e3a79
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 11 16:53:51 2013 -0400

    Can't get away with one query here. Need to purge other device_policykey entries.

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

http://github.com/horde/horde/commit/9c6d39fd2759bdf791e6a2b81dfe9055541e3a79
http://git.horde.org/horde-git/-/commit/9c6d39fd2759bdf791e6a2b81dfe9055541e3a79

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

commit 337dad87cd2d31a9ae4f052f84e08f0f8636bd93
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 13 15:13:02 2013 -0400

    Simplify

 framework/ActiveSync/lib/Horde/ActiveSync.php |   54 ++++++++++++-------------
 1 files changed, 26 insertions(+), 28 deletions(-)

http://github.com/horde/horde/commit/337dad87cd2d31a9ae4f052f84e08f0f8636bd93
http://git.horde.org/horde-git/-/commit/337dad87cd2d31a9ae4f052f84e08f0f8636bd93

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

commit 71b28b62aca1f41becd0bd62df96a8c3bd4f36b2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 13 15:13:56 2013 -0400

    More atomic tracking of dirty properties in device object.

 framework/ActiveSync/lib/Horde/ActiveSync/Device.php |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/71b28b62aca1f41becd0bd62df96a8c3bd4f36b2
http://git.horde.org/horde-git/-/commit/71b28b62aca1f41becd0bd62df96a8c3bd4f36b2

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

commit 8e6ff03f1ac2c6bc7563357f143e3309b021dd6a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 13 15:15:19 2013 -0400

    Only save the dirty data.
    
    Reduces the number of times the device object needs to be saved,
    and when it does, allows drivers to only save the specific data that
    is dirty.

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

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

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

commit 883c0c51c67c7bd47b29f52d70c19c60dc1ceb16
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 13 15:16:52 2013 -0400

    Fix dirty property tracking for SyncCache.

 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php |   99 +++++++++------
 1 files changed, 58 insertions(+), 41 deletions(-)

http://github.com/horde/horde/commit/883c0c51c67c7bd47b29f52d70c19c60dc1ceb16
http://git.horde.org/horde-git/-/commit/883c0c51c67c7bd47b29f52d70c19c60dc1ceb16

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

commit ced762b41fdac0c5ed00978f828dea4ca2076ba2
Merge: 883c0c5 73a403f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 13 15:19:24 2013 -0400

    Merge branch 'master' into activesync_2_9_0

 framework/Core/js/calendar.js                          |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php |    2 +-
 framework/Imap_Client/package.xml                      |   19 +++++++++++--
 imp/lib/Basic/Search.php                               |    6 +++-
 imp/lib/Dynamic/Mailbox.php                            |   23 ++++++++++++---
 5 files changed, 40 insertions(+), 12 deletions(-)

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

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

commit 5b5d8342b509cb678c1ceff9d98b1573cd7ea8a9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 13 15:48:44 2013 -0400

    Ensure folderids are taken as strings.
    
    Prevents mongoDB from interpreting them as integers and overflowing.

 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/5b5d8342b509cb678c1ceff9d98b1573cd7ea8a9
http://git.horde.org/horde-git/-/commit/5b5d8342b509cb678c1ceff9d98b1573cd7ea8a9

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

commit bbd234466895acd0006db0ebb2e81a5bdcbc9880
Merge: 5b5d834 31f639c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:12:05 2013 -0400

    Merge branch 'master' into activesync_2_9_0
    
    Conflicts:
    	framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php
    	framework/ActiveSync/package.xml

 ansel/locale/ansel.pot                                           |   64 +-
 ansel/locale/de/LC_MESSAGES/ansel.mo                             |  Bin 107152 -> 107152 bytes
 ansel/locale/de/LC_MESSAGES/ansel.po                             |   62 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php         |   54 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php          |  161 +-
 framework/ActiveSync/locale/Horde_ActiveSync.pot                 |   36 +-
 framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.mo   |  Bin 1432 -> 1432 bytes
 framework/ActiveSync/locale/de/LC_MESSAGES/Horde_ActiveSync.po   |   36 +-
 framework/ActiveSync/package.xml                                 |   23 +-
 framework/Auth/locale/Horde_Auth.pot                             |    4 +-
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.mo               |  Bin 3373 -> 3373 bytes
 framework/Auth/locale/de/LC_MESSAGES/Horde_Auth.po               |    4 +-
 framework/Auth/package.xml                                       |   22 +-
 framework/Core/js/jquery.mobile/jquery.js                        | 5625 ++--
 framework/Core/js/jquery.mobile/jquery.min.js                    |    7 +-
 framework/Core/js/jquery.mobile/jquery.mobile.js                 | 8720 ++++--
 framework/Core/js/jquery.mobile/jquery.mobile.min.css            |   14 +-
 framework/Core/js/jquery.mobile/jquery.mobile.min.js             |   11 +-
 framework/Core/js/smartmobile.js                                 |   11 +-
 framework/Core/lib/Horde/Core/ActiveSync/Connector.php           |   33 +-
 framework/Core/lib/Horde/Core/Ui/FlagImage.php                   |   60 +-
 framework/Core/lib/Horde/Themes/Image.php                        |   16 +
 framework/Core/locale/Horde_Core.pot                             |   80 +-
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.mo               |  Bin 20259 -> 20259 bytes
 framework/Core/locale/de/LC_MESSAGES/Horde_Core.po               |   86 +-
 framework/Core/package.xml                                       |   28 +-
 framework/Css_Parser/package.xml                                 |   21 +-
 framework/Date/locale/Horde_Date.pot                             |   14 +-
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.mo               |  Bin 1126 -> 1126 bytes
 framework/Date/locale/de/LC_MESSAGES/Horde_Date.po               |   14 +-
 framework/Date/package.xml                                       |   23 +-
 framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php                   |   44 +-
 framework/Db/lib/Horde/Db/SearchParser.php                       |    2 +-
 framework/Db/package.xml                                         |    2 +
 framework/History/package.xml                                    |   24 +-
 framework/Imap_Client/locale/Horde_Imap_Client.pot               |   96 +-
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.mo |  Bin 7202 -> 7202 bytes
 framework/Imap_Client/locale/de/LC_MESSAGES/Horde_Imap_Client.po |   96 +-
 framework/Log/package.xml                                        |   21 +-
 framework/Mail/lib/Horde/Mail/Rfc822/Address.php                 |    6 +-
 framework/Mail/package.xml                                       |   20 +-
 framework/Mail/test/Horde/Mail/AddressTest.php                   |   15 +
 framework/Mongo/package.xml                                      |   19 +-
 framework/Pear/package.xml                                       |   23 +-
 framework/Rpc/package.xml                                        |   20 +-
 framework/Service_Facebook/package.xml                           |   20 +-
 framework/Smtp/lib/Horde/Smtp.php                                |    6 +-
 framework/Smtp/locale/Horde_Smtp.pot                             |   14 +-
 framework/Smtp/package.xml                                       |   24 +-
 framework/SpellChecker/lib/Horde/SpellChecker/Aspell.php         |    1 +
 framework/SpellChecker/package.xml                               |   20 +-
 framework/Stream/package.xml                                     |   35 +-
 hermes/locale/de/LC_MESSAGES/hermes.mo                           |  Bin 82147 -> 82494 bytes
 hermes/locale/de/LC_MESSAGES/hermes.po                           |  113 +-
 hermes/locale/hermes.pot                                         |  111 +-
 horde/config/conf.xml                                            |    3 +-
 horde/docs/CHANGES                                               |    2 +
 horde/lib/Test.php                                               |   87 +-
 horde/locale/de/LC_MESSAGES/horde.mo                             |  Bin 66215 -> 66215 bytes
 horde/locale/de/LC_MESSAGES/horde.po                             |   12 +-
 horde/locale/horde.pot                                           |   14 +-
 horde/package.xml                                                |    2 +
 imp/docs/CHANGES                                                 |    2 +
 imp/js/compose-dimp.js                                           |   51 +-
 imp/js/search.js                                                 |    4 +-
 imp/js/smartmobile.js                                            |    2 +-
 imp/locale/de/LC_MESSAGES/imp.mo                                 |  Bin 184529 -> 184945 bytes
 imp/locale/de/LC_MESSAGES/imp.po                                 |  660 +-
 imp/locale/imp.pot                                               |  654 +-
 imp/package.xml                                                  |    4 +
 ingo/locale/de/LC_MESSAGES/ingo.mo                               |  Bin 85776 -> 85776 bytes
 ingo/locale/de/LC_MESSAGES/ingo.po                               |    6 +-
 ingo/locale/ingo.pot                                             |    8 +-
 kronolith/docs/CHANGES                                           |    2 +
 kronolith/js/kronolith.js                                        |   37 +-
 kronolith/locale/de/LC_MESSAGES/kronolith.mo                     |  Bin 128131 -> 128131 bytes
 kronolith/locale/de/LC_MESSAGES/kronolith.po                     |  104 +-
 kronolith/locale/kronolith.pot                                   |  106 +-
 kronolith/package.xml                                            |    2 +
 nag/docs/CHANGES                                                 |    2 +
 nag/lib/Application.php                                          |    2 +-
 nag/lib/CompleteTask.php                                         |    2 +-
 nag/lib/Driver.php                                               |   23 +-
 nag/lib/Task.php                                                 |   13 -
 nag/locale/de/LC_MESSAGES/nag.mo                                 |  Bin 92459 -> 92459 bytes
 nag/locale/de/LC_MESSAGES/nag.po                                 |   14 +-
 nag/locale/nag.pot                                               |   16 +-
 nag/package.xml                                                  |    6 +-
 turba/docs/CHANGES                                               |    1 +
 turba/lib/Application.php                                        |    2 +-
 turba/locale/de/LC_MESSAGES/turba.mo                             |  Bin 98885 -> 99010 bytes
 turba/locale/de/LC_MESSAGES/turba.po                             |   88 +-
 turba/locale/turba.pot                                           |   84 +-
 turba/package.xml                                                |    2 +
 whups/docs/CHANGES                                               |    2 +
 whups/lib/Driver/Sql.php                                         |    3 +-
 whups/lib/Whups.php                                              |    2 +-
 whups/locale/de/LC_MESSAGES/whups.mo                             |  Bin 108100 -> 108201 bytes
 whups/locale/de/LC_MESSAGES/whups.po                             |  138 +-
 whups/locale/whups.pot                                           |  134 +-
 whups/package.xml                                                |    4 +
 wicked/locale/de/LC_MESSAGES/wicked.mo                           |  Bin 78398 -> 78398 bytes
 wicked/locale/de/LC_MESSAGES/wicked.po                           |   56 +-
 wicked/locale/wicked.pot                                         |   58 +-
 104 files changed, 10480 insertions(+), 7895 deletions(-)

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

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

commit 6a01ec1b08e7303183930902afc9a4c4ef4d12b9
Merge: bbd2344 7d4a2a5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:19:23 2013 -0400

    Merge branch 'master' into activesync_2_9_0
    
    Conflicts:
    	framework/ActiveSync/package.xml

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

http://github.com/horde/horde/commit/6a01ec1b08e7303183930902afc9a4c4ef4d12b9
http://git.horde.org/horde-git/-/commit/6a01ec1b08e7303183930902afc9a4c4ef4d12b9

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

commit 0e6f790733668e8beaa2fa1faf01c8a51f9a5feb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:27:04 2013 -0400

    Force folderids to be strings, the easy way.

 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/0e6f790733668e8beaa2fa1faf01c8a51f9a5feb
http://git.horde.org/horde-git/-/commit/0e6f790733668e8beaa2fa1faf01c8a51f9a5feb

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

commit 2c68023088183bc42629d42b6c1061fbdb78180c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:31:56 2013 -0400

    Get rid of useless comment.

 framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

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

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

commit 61289cce291beb1b4f740e3441c6e9668c10adc0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 13:33:13 2013 -0400

    Ensure we have a synckey here as well.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php  |   18 +++++++++++++
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |    7 +++-
 2 files changed, 23 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/61289cce291beb1b4f740e3441c6e9668c10adc0
http://git.horde.org/horde-git/-/commit/61289cce291beb1b4f740e3441c6e9668c10adc0

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

commit e800d7f1afabbd964f3746e4b71c5a5d815f5194
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 15:52:51 2013 -0400

    Refactor H_AS_State_Mongo::_getPIMChangeTS for recent changes.

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

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

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

commit 3f8e4b3c7d349b4edfefd60e407c854be8af09be
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 15:54:40 2013 -0400

    Update base class

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php |   30 ++++----------
 1 files changed, 8 insertions(+), 22 deletions(-)

http://github.com/horde/horde/commit/3f8e4b3c7d349b4edfefd60e407c854be8af09be
http://git.horde.org/horde-git/-/commit/3f8e4b3c7d349b4edfefd60e407c854be8af09be

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

commit e48b6dace1952daffd97e61b5bc5cb990ea14c00
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 16:17:27 2013 -0400

    Fix nesting.

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

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

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

commit 9d4093cd9de138fc104fbf57eb070208c9b54375
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 16:18:07 2013 -0400

    Implement _getMailmapChanges for Mongo driver.

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

http://github.com/horde/horde/commit/9d4093cd9de138fc104fbf57eb070208c9b54375
http://git.horde.org/horde-git/-/commit/9d4093cd9de138fc104fbf57eb070208c9b54375

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

commit 36de5a59cc56c15c28f0427b46f4e1655d23214f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 16:19:13 2013 -0400

    Remove debug output.

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

http://github.com/horde/horde/commit/36de5a59cc56c15c28f0427b46f4e1655d23214f
http://git.horde.org/horde-git/-/commit/36de5a59cc56c15c28f0427b46f4e1655d23214f

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

commit bb7021654018a2cca0fd4d7b5444b05e253d96e9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 16:19:59 2013 -0400

    No longer used.

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

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

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

commit b7350cb43eb2d6cf330931d6eb3e5a4ec010bd3e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 16:23:45 2013 -0400

    Do not need to cast these, they are now always strings.

 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

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

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

commit f1105f830d3efeeb4d739fa56f41a1c4c781cc16
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 16:32:04 2013 -0400

    Add some logging to help see where data is being changed.

 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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

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

commit c9ea48b5270132307e00fa84baf347d65a20467c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 17:09:42 2013 -0400

    Use projections to limit the fields returned for SyncCache when possible.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |   20 +++++++++++--
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php   |   11 ++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

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

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

commit 73755b08d41b68f547a904e9613f0b92125ad200
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 17:13:04 2013 -0400

    We only need sync_data here.

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

http://github.com/horde/horde/commit/73755b08d41b68f547a904e9613f0b92125ad200
http://git.horde.org/horde-git/-/commit/73755b08d41b68f547a904e9613f0b92125ad200

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

commit a38fa4b0bf0087d657b1f1f3726d294c72e59cb3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 17:18:11 2013 -0400

    Only need 'users' here.

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

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

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

commit 7e4fb52aa35195929913292aed357caa98b76ad1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 17:25:00 2013 -0400

    Only need the _id here, not the data.

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

http://github.com/horde/horde/commit/7e4fb52aa35195929913292aed357caa98b76ad1
http://git.horde.org/horde-git/-/commit/7e4fb52aa35195929913292aed357caa98b76ad1

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

commit 79ba96fa731a58ff20183be109cc11709d85a241
Merge: 7e4fb52 227e171
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 18:52:01 2013 -0400

    Merge branch 'master' into activesync_2_9_0

 ansel/composer.json                                               |   70 +
 beatnik/composer.json                                             |   26 +
 chora/composer.json                                               |   30 +
 components/composer.json                                          |   45 +
 components/lib/Components/Component.php                           |   11 +-
 components/lib/Components/Component/Base.php                      |   16 +-
 components/lib/Components/Component/Source.php                    |   26 +
 components/lib/Components/Helper/Composer.php                     |   38 +-
 components/lib/Components/Module/Release.php                      |    1 +
 components/lib/Components/Release/Task/Composer.php               |   82 +
 components/lib/Components/Runner/Composer.php                     |   22 +-
 components/lib/Components/Runner/Release.php                      |    5 +
 components/package.xml                                            |    2 +
 content/composer.json                                             |   44 +
 framework/ActiveSync/composer.json                                |   39 +
 framework/Alarm/composer.json                                     |   38 +
 framework/Argv/composer.json                                      |   35 +
 framework/Auth/composer.json                                      |   53 +
 framework/Autoloader/composer.json                                |   33 +
 framework/Autoloader_Cache/composer.json                          |   39 +
 framework/Browser/composer.json                                   |   32 +
 framework/Cache/composer.json                                     |   43 +
 framework/Cli/composer.json                                       |   32 +
 framework/Cli_Modular/composer.json                               |   29 +
 framework/Compress/composer.json                                  |   43 +
 framework/Compress_Fast/composer.json                             |   31 +
 framework/Constraint/composer.json                                |   28 +
 framework/Controller/composer.json                                |   40 +
 framework/Core/composer.json                                      |  116 ++
 framework/Crypt/composer.json                                     |   40 +
 framework/Crypt_Blowfish/composer.json                            |   32 +
 framework/Css_Parser/composer.json                                |   28 +
 framework/Data/composer.json                                      |   40 +
 framework/DataTree/composer.json                                  |   25 +
 framework/Date/composer.json                                      |   38 +
 framework/Date_Parser/composer.json                               |   35 +
 framework/Dav/composer.json                                       |   25 +-
 framework/Db/composer.json                                        |   49 +
 framework/Editor/composer.json                                    |   33 +
 framework/ElasticSearch/composer.json                             |   32 +
 framework/Exception/composer.json                                 |   39 +
 framework/Feed/composer.json                                      |   32 +
 framework/Form/composer.json                                      |   40 +
 framework/Group/composer.json                                     |   37 +
 framework/HashTable/composer.json                                 |   30 +
 framework/History/composer.json                                   |   31 +
 framework/Http/composer.json                                      |   37 +
 framework/Icalendar/composer.json                                 |   45 +
 framework/Image/composer.json                                     |   41 +
 framework/Imap_Client/composer.json                               |   43 +
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php   |  117 --
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   23 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php |  128 --
 .../Imap_Client/lib/Horde/Imap/Client/Socket/Connection/Pop3.php  |   11 +-
 .../lib/Horde/Imap/Client/Socket/Connection/Socket.php            |   47 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |   22 +-
 framework/Imap_Client/package.xml                                 |    7 +
 framework/Imsp/composer.json                                      |   26 +
 framework/Injector/composer.json                                  |   29 +
 framework/Itip/composer.json                                      |   36 +
 framework/Kolab_Cli/composer.json                                 |   37 +
 framework/Kolab_Config/composer.json                              |   29 +
 framework/Kolab_Filter/composer.json                              |   38 +
 framework/Kolab_Format/composer.json                              |   32 +
 framework/Kolab_FreeBusy/composer.json                            |   34 +
 framework/Kolab_Resource/composer.json                            |   32 +
 framework/Kolab_Server/composer.json                              |   35 +
 framework/Kolab_Session/composer.json                             |   32 +
 framework/Kolab_Storage/composer.json                             |   40 +
 framework/Ldap/composer.json                                      |   36 +
 framework/Lens/composer.json                                      |   25 +
 framework/ListHeaders/composer.json                               |   29 +
 framework/Lock/composer.json                                      |   32 +
 framework/Log/composer.json                                       |   38 +
 framework/LoginTasks/composer.json                                |   30 +
 framework/Mail/composer.json                                      |   35 +
 framework/Memcache/composer.json                                  |   28 +
 framework/Mime/composer.json                                      |   46 +
 framework/Mime_Viewer/composer.json                               |   34 +
 framework/Mongo/composer.json                                     |   26 +
 framework/Nls/composer.json                                       |   36 +
 framework/Notification/composer.json                              |   33 +
 framework/Oauth/composer.json                                     |   29 +
 framework/Pdf/composer.json                                       |   39 +
 framework/Pear/composer.json                                      |   31 +
 framework/Perms/composer.json                                     |   39 +
 framework/Prefs/composer.json                                     |   51 +
 framework/PubSub/composer.json                                    |   28 +
 framework/Push/composer.json                                      |   37 +
 framework/Queue/composer.json                                     |   25 +
 framework/Rampage/composer.json                                   |   25 +
 framework/Rdo/composer.json                                       |   30 +
 framework/Reflection/composer.json                                |   25 +
 framework/Release/composer.json                                   |   35 +
 framework/Role/composer.json                                      |   30 +
 framework/Routes/composer.json                                    |   35 +
 framework/Rpc/composer.json                                       |   52 +
 framework/Scheduler/composer.json                                 |   28 +
 framework/Scribe/composer.json                                    |   26 +
 framework/Secret/composer.json                                    |   37 +
 framework/Serialize/composer.json                                 |   47 +
 framework/Service_Facebook/composer.json                          |   31 +
 framework/Service_Gravatar/composer.json                          |   30 +
 framework/Service_Scribd/composer.json                            |   28 +
 framework/Service_Twitter/composer.json                           |   30 +
 framework/Service_UrlShortener/composer.json                      |   28 +
 framework/Service_Vimeo/composer.json                             |   26 +
 framework/Service_Weather/composer.json                           |   32 +
 framework/SessionHandler/composer.json                            |   44 +
 framework/Share/composer.json                                     |   47 +
 framework/Smtp/composer.json                                      |   33 +
 framework/Smtp/lib/Horde/Smtp.php                                 |   22 +-
 framework/Smtp/lib/Horde/Smtp/Connection.php                      |  164 +--
 framework/Smtp/package.xml                                        |    9 +-
 framework/Socket_Client/doc/Horde/Socket/Client/COPYING           |  458 +++++
 framework/Socket_Client/lib/Horde/Socket/Client.php               |  198 ++
 framework/Socket_Client/lib/Horde/Socket/Client/Exception.php     |   28 +
 framework/Socket_Client/package.xml                               |   95 +
 framework/SpellChecker/composer.json                              |   32 +
 framework/Stream/composer.json                                    |   29 +
 framework/Stream_Filter/composer.json                             |   33 +
 framework/Stream_Wrapper/composer.json                            |   30 +
 framework/Support/composer.json                                   |   40 +
 framework/SyncMl/composer.json                                    |   36 +
 framework/Template/composer.json                                  |   33 +
 framework/Test/composer.json                                      |   39 +
 framework/Text_Diff/composer.json                                 |   36 +
 framework/Text_Filter/composer.json                               |   43 +
 framework/Text_Filter_Csstidy/composer.json                       |   30 +
 framework/Text_Flowed/composer.json                               |   29 +
 framework/Text_Textile/composer.json                              |   28 +
 framework/Thrift/composer.json                                    |   25 +
 framework/Timezone/composer.json                                  |   31 +
 framework/Token/composer.json                                     |   40 +
 framework/Translation/composer.json                               |   29 +
 framework/Tree/composer.json                                      |   41 +
 framework/Url/composer.json                                       |   34 +
 framework/Util/composer.json                                      |   46 +
 framework/Vcs/composer.json                                       |   41 +
 framework/Vfs/composer.json                                       |   44 +
 framework/View/composer.json                                      |   39 +
 framework/Xml_Element/composer.json                               |   30 +
 framework/Xml_Wbxml/composer.json                                 |   34 +
 framework/Yaml/composer.json                                      |   34 +
 framework/admintools/composer.json                                |   30 +
 framework/bin/horde-generate-module.php                           |  133 ++
 framework/bin/horde-rev-cmp.sh                                    |   11 +
 framework/bin/horde-run-cmd.php                                   |   31 +
 framework/devtools/COPYING                                        |  458 -----
 framework/devtools/README                                         |   18 -
 framework/devtools/horde-generate-module.php                      |  133 --
 framework/devtools/horde-merge.php                                |  135 --
 framework/devtools/horde-rev-cmp.sh                               |   11 -
 framework/devtools/package.xml                                    |   76 -
 framework/lz4/composer.json                                       |   25 +
 gollem/composer.json                                              |   56 +
 hermes/composer.json                                              |   56 +
 horde/composer.json                                               |   89 +
 imp/composer.json                                                 |   81 +
 imp/docs/CHANGES                                                  |    4 +-
 imp/lib/Compose.php                                               |   14 +-
 imp/package.xml                                                   |    4 +-
 ingo/composer.json                                                |   54 +
 jonah/composer.json                                               |   31 +
 kolab/composer.json                                               |   25 +
 koward/composer.json                                              |   41 +
 kronolith/composer.json                                           |   79 +
 mnemo/composer.json                                               |   55 +
 nag/composer.json                                                 |   64 +
 passwd/composer.json                                              |   48 +
 pastie/composer.json                                              |   34 +
 sam/composer.json                                                 |   27 +
 sesha/composer.json                                               |   40 +
 timeobjects/composer.json                                         |   40 +
 trean/composer.json                                               |   60 +
 turba/composer.json                                               |   71 +
 ulaform/composer.json                                             |   28 +
 whups/composer.json                                               |   55 +
 wicked/composer.json                                              |   58 +
 180 files changed, 6695 insertions(+), 1324 deletions(-)

http://github.com/horde/horde/commit/79ba96fa731a58ff20183be109cc11709d85a241
http://git.horde.org/horde-git/-/commit/79ba96fa731a58ff20183be109cc11709d85a241

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

commit 3571dcb69028be4d5ccad65addcc0521205f7302
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 18:55:34 2013 -0400

    Add Horde_Mongo as optional dependency for Horde_ActiveSync

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

http://github.com/horde/horde/commit/3571dcb69028be4d5ccad65addcc0521205f7302
http://git.horde.org/horde-git/-/commit/3571dcb69028be4d5ccad65addcc0521205f7302

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

commit d8706724a17455bfc26a77f768d38b2441b72999
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 19:07:47 2013 -0400

    Fix tests.

 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

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

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

commit 1be10f89c207835647539bb3e056b6ecfea47dac
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 19:10:52 2013 -0400

    Match function signatures.

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

http://github.com/horde/horde/commit/1be10f89c207835647539bb3e056b6ecfea47dac
http://git.horde.org/horde-git/-/commit/1be10f89c207835647539bb3e056b6ecfea47dac

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

commit 8cded7f741bb9c73e57ee59e461ff7eb89737549
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 19:26:50 2013 -0400

    No reason not to restrict what is returned, even if we already have it.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

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

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

commit b489d9165637f1766930610e77098f96ed4bacff
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 16 19:29:05 2013 -0400

    Add test for restricting fields returned from the syncCache query.

 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php     |    8 +++++
 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |    8 +++++
 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php |    8 +++++
 3 files changed, 24 insertions(+), 0 deletions(-)

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

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

commit e2ce88c5ba1198a4b8a15092481be03bf08fd994
Merge: b489d91 2eb674d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 08:52:57 2013 -0400

    Merge branch 'master' into activesync_2_9_0

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |    9 +-
 framework/Core/lib/Horde/Core/ActiveSync/Auth.php       |    9 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php     |    2 +-
 framework/Core/package.xml                              |    2 +
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php  |    8 +-
 framework/Imap_Client/package.xml                       |   12 +-
 framework/Smtp/lib/Horde/Smtp.php                       |    5 +-
 framework/bin/horde-generate-module                     |  133 +++++++++++++++
 framework/bin/horde-generate-module.php                 |  133 ---------------
 framework/bin/horde-git-split                           |   40 +++++
 framework/bin/horde-rev-cmp                             |   11 ++
 framework/bin/horde-rev-cmp.sh                          |   11 --
 framework/bin/horde-run-cmd                             |   32 ++++
 framework/bin/horde-run-cmd.php                         |   31 ----
 horde/js/json2.js                                       |    6 +-
 imp/locale/de/LC_MESSAGES/imp.po                        |    4 +-
 16 files changed, 246 insertions(+), 202 deletions(-)

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

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

commit cfbbd688b104886137d497f98d06878e06078a3a
Merge: e2ce88c 0790dbf
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 11:13:43 2013 -0400

    Merge branch 'master' into activesync_2_9_0

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |    3 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php  |   13 ++++---
 framework/Ldap/lib/Horde/Ldap.php                       |   27 ++++++++++----
 framework/Ldap/package.xml                              |    6 ++-
 framework/Ldap/test/Horde/Ldap/LdapTest.php             |    7 ++++
 framework/Smtp/lib/Horde/Smtp.php                       |   13 ++++---
 framework/Vfs/lib/Horde/Vfs/Ssh2.php                    |    9 +----
 framework/Vfs/package.xml                               |    6 ++--
 horde/docs/INSTALL                                      |   24 ++++++------
 horde/services/twitter/index.php                        |    2 +-
 imp/lib/Basic/Message.php                               |    6 ++-
 11 files changed, 69 insertions(+), 47 deletions(-)

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

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

commit 4be84469b6b2c18c9a79f4f0bda02d919e858d7a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 13:05:50 2013 -0400

    Typo

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

http://github.com/horde/horde/commit/4be84469b6b2c18c9a79f4f0bda02d919e858d7a
http://git.horde.org/horde-git/-/commit/4be84469b6b2c18c9a79f4f0bda02d919e858d7a

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

commit b6404759080d7bf177b94e16dfb7196498da5137
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 13:14:28 2013 -0400

    prefix the activesync mongo collections with HAS_

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

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

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

commit b10fbdaf2e07f9be5f5d616d71c4bcad2c87c34c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 16:30:06 2013 -0400

    This lives in the base class.

 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php |   32 ---------------
 1 files changed, 0 insertions(+), 32 deletions(-)

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

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

commit b70fc2246105a018547e5d30f43430f3a4959ec1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 16:32:33 2013 -0400

    Add Horde_ActiveSync_State_Base::getFolderIdToBackendMap()
    
    Deprecates the inefficient getFolderIdForBackendId().

 framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php |   35 +++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

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

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

commit 3a6a1a346c3a92572e50f3ee582cd39dedb195d8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 16:33:39 2013 -0400

    Use the uid map, and save tons of database calls to load the syncCache.

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php |   10 ++++--
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php |   22 +++++++-----
 2 files changed, 20 insertions(+), 12 deletions(-)

http://github.com/horde/horde/commit/3a6a1a346c3a92572e50f3ee582cd39dedb195d8
http://git.horde.org/horde-git/-/commit/3a6a1a346c3a92572e50f3ee582cd39dedb195d8

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

commit 7ec9d2650f3f95e50012dec459a89b18b10b4953
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 18:37:40 2013 -0400

    Clean up some logging.

 framework/ActiveSync/lib/Horde/ActiveSync.php             |   38 ++++-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php |  117 +++++++++----
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php   |   80 +++++++--
 3 files changed, 181 insertions(+), 54 deletions(-)

http://github.com/horde/horde/commit/7ec9d2650f3f95e50012dec459a89b18b10b4953
http://git.horde.org/horde-git/-/commit/7ec9d2650f3f95e50012dec459a89b18b10b4953

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

commit b741276de8961cd6e0b70c88fc3dc820416ce9d1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 17 19:16:40 2013 -0400

    More logging improvements/cleanup.

 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php        |    5 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php |   21 ++-
 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php |   14 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php        |    6 +
 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php       |   68 ++++--
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php          |   20 +-
 framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php          |   29 ++-
 7 files changed, 119 insertions(+), 44 deletions(-)

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

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

commit 7dcfdc395770588f9249b015d1cc17d2fcf0d10e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 18 21:25:45 2013 -0400

    Typo

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

http://github.com/horde/horde/commit/7dcfdc395770588f9249b015d1cc17d2fcf0d10e
http://git.horde.org/horde-git/-/commit/7dcfdc395770588f9249b015d1cc17d2fcf0d10e

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

commit 538cc4f5f1a98286d12c2c5d99372b20dbc812aa
Merge: 7dcfdc3 7605249
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 18 21:30:13 2013 -0400

    Merge branch 'master' into activesync_2_9_0

 framework/Icalendar/package.xml                                |    1 -
 framework/ListHeaders/lib/Horde/ListHeaders.php                |   20 +
 framework/ListHeaders/lib/Horde/ListHeaders/Translation.php    |   57 +
 framework/ListHeaders/locale/Horde_ListHeaders.pot             |   46 +
 framework/ListHeaders/package.xml                              |   32 +-
 framework/Mime/lib/Horde/Mime/Headers.php                      |    2 +
 framework/Smtp/composer.json                                   |    3 +-
 framework/Smtp/lib/Horde/Smtp/Filter/Data.php                  |    2 +-
 framework/Smtp/package.xml                                     |   21 +-
 framework/Smtp/test/Horde/Smtp/FilterDataTest.php              |   53 +
 framework/Socket_Client/composer.json                          |   29 +
 framework/Socket_Client/package.xml                            |   21 +-
 framework/Timezone/lib/Horde/Timezone.php                      |    2 +-
 framework/Timezone/lib/Horde/Timezone/Rule.php                 |   59 +-
 framework/Timezone/lib/Horde/Timezone/Zone.php                 |    3 +-
 framework/Timezone/package.xml                                 |   21 +-
 framework/Timezone/test/Horde/Timezone/IcalendarTest.php       |    9 +
 framework/Timezone/test/Horde/Timezone/fixtures/europe.ics     |  561 ++++----
 framework/Timezone/test/Horde/Timezone/fixtures/losangeles.ics |  122 ++
 framework/Timezone/test/Horde/Timezone/fixtures/northamerica   |   27 +
 framework/admintools/README                                    |   25 -
 framework/admintools/composer.json                             |   30 -
 framework/admintools/horde-base.php                            |   13 -
 framework/admintools/horde-remove-pref.php                     |   52 -
 framework/admintools/horde-sql-shell.php                       |   33 -
 framework/admintools/package.xml                               |   97 --
 horde/bin/horde-pref-remove.php                                |   53 +
 horde/bin/horde-remove-user-data                               |   54 +
 horde/bin/horde-sql-shell.php                                  |   42 +
 horde/docs/CHANGES                                             |    1 +
 horde/docs/INSTALL                                             |    6 +-
 horde/package.xml                                              |   12 +-
 32 files changed, 918 insertions(+), 591 deletions(-)

http://github.com/horde/horde/commit/538cc4f5f1a98286d12c2c5d99372b20dbc812aa
http://git.horde.org/horde-git/-/commit/538cc4f5f1a98286d12c2c5d99372b20dbc812aa

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

commit 6aed3612c7786cf0bf073cf475809bb9a3e80849
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Fri Oct 18 21:54:07 2013 -0400

    More logging changes.

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

http://github.com/horde/horde/commit/6aed3612c7786cf0bf073cf475809bb9a3e80849
http://git.horde.org/horde-git/-/commit/6aed3612c7786cf0bf073cf475809bb9a3e80849

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

commit 2d697fd5c289abe57a2a381e77fd2b09c8fc9d43
Merge: 6aed361 3bf7599
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Oct 21 20:24:56 2013 -0400

    Merge branch 'master' into activesync_2_9_0

 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php       |    2 +-
 framework/Alarm/lib/Horde/Alarm/Sql.php                          |    4 +-
 framework/Alarm/package.xml                                      |   20 ++-
 framework/Core/package.xml                                       |   23 ++-
 framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING            |    9 +
 framework/Imap_Client/lib/Horde/Imap/Client/Password/Xoauth2.php |   71 ++++++
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php           |   38 ++--
 framework/Imap_Client/package.xml                                |   12 +-
 framework/Test/lib/Horde/Test/Autoload.php                       |    2 +-
 framework/Test/package.xml                                       |    4 +-
 horde/login.php                                                  |    4 +
 11 files changed, 147 insertions(+), 42 deletions(-)

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

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

commit 88187a73b1d148436846498dac8cd6c45aee1e72
Merge: 2d697fd 851160d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 22 09:53:47 2013 -0400

    Merge branch 'master' into activesync_2_9_0
    
    Conflicts:
    	framework/ActiveSync/package.xml

 framework/ActiveSync/package.xml |   19 ++++++++++++++++---
 kronolith/js/smartmobile.js      |   14 +++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

http://github.com/horde/horde/commit/88187a73b1d148436846498dac8cd6c45aee1e72
http://git.horde.org/horde-git/-/commit/88187a73b1d148436846498dac8cd6c45aee1e72

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

commit 2c07b01c2a933ed970b5ce47a91af5a40d31282e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 22 10:00:40 2013 -0400

    Changes, bump version.

 framework/ActiveSync/package.xml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

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

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

commit ec7a55d13c3492e9b8d51bd4c9a3b529e785badf
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 22 10:15:43 2013 -0400

    Add test for mongo.

 horde/lib/Test.php |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

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




More information about the commits mailing list