The branch "horde_5_2" has been updated. The following is a summary of the commits.
from: 669136f1379894d28cba4b65c22502844b76da3c bfc7cfd Per MS-ASCMD 2.2.3.34, DELETE never conflicts - it always takes precedence. 1629c3e Update the state after the messages are deleted. 8efcc05 Use ::getSyncStamp() for consistency. e8206ea Parse incoming SMS messages, even if we ignore them. 036d6e1 Bump version due to API/method signature changes. 42e862b Add ability to return IDN encoded bare addresses. 30f143a phpdoc 21bc7a6 [mms] Ensure Registry exists in error handler before attempting to access it (Bug #12540). 912004e [mms] Translate mailbox names from UTF7-IMAP -> UTF-8 in return from Horde_Imap_Client_Base#getMetadata() (Bug #12541). e538618 Improve logging output here. 1b5bbee Fix sync loop when no history exists yet. 81d12a8 BFN 65f5b72 Remove unused protected method. 588989f Always track the timestamp, even if using modseq. 5a553b5 CHANGES, add migration file. 861169e Shorter variable name. c4f6d08 Better check for ensuring the device belongs to the user before wiping. bf9ce5b Merge branch 'master' into horde_5_2 ----------------------------------------------------------------------- commit bfc7cfd8680ceef77a54fc7ebfef5a8f06eef0f5 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 17:44:40 2013 -0400 Per MS-ASCMD 2.2.3.34, DELETE never conflicts - it always takes precedence. Bug: 12523 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 14 ------ 1 files changed, 0 insertions(+), 14 deletions(-) http://git.horde.org/horde-git/-/commit/bfc7cfd8680ceef77a54fc7ebfef5a8f06eef0f5 ----------------------------------------------------------------------- commit 1629c3e418494acd743116585c51f5deb345655d Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 17:56:15 2013 -0400 Update the state after the messages are deleted. Bug: 12523 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 16 ++---- 1 files changed, 6 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/1629c3e418494acd743116585c51f5deb345655d ----------------------------------------------------------------------- commit 8efcc05926bb91f2be798e0151402537964a7558 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 17:56:59 2013 -0400 Use ::getSyncStamp() for consistency. Bug: 12523 framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8efcc05926bb91f2be798e0151402537964a7558 ----------------------------------------------------------------------- commit e8206ea53cce2c052c267dd5f60e7c83383beef1 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 18:45:13 2013 -0400 Parse incoming SMS messages, even if we ignore them. Bug: 12544 framework/ActiveSync/lib/Horde/ActiveSync.php | 1 + framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 13 +++++- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 8 +++- 3 files changed, 20 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/e8206ea53cce2c052c267dd5f60e7c83383beef1 ----------------------------------------------------------------------- commit 036d6e1e30f4d88c0841b73338971c2f719877b5 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 18:47:41 2013 -0400 Bump version due to API/method signature changes. framework/ActiveSync/package.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/036d6e1e30f4d88c0841b73338971c2f719877b5 ----------------------------------------------------------------------- commit 42e862bfb960592a94dba4da39645273e4e4f4e6 Author: Michael M Slusarz <[email protected]> Date: Wed Aug 7 15:01:03 2013 -0600 Add ability to return IDN encoded bare addresses. [mms] Added the 'bare_address_idn' property to Horde_Mail_Rfc822_Address. [mms] Added the 'bare_addresses_idn' property to Horde_Mail_Rfc822_List. framework/Mail/doc/Horde/Mail/UPGRADING | 12 ++++++++++++ framework/Mail/lib/Horde/Mail/Rfc822/Address.php | 9 +++++++++ framework/Mail/lib/Horde/Mail/Rfc822/List.php | 7 +++++++ framework/Mail/package.xml | 6 ++++-- 4 files changed, 32 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/42e862bfb960592a94dba4da39645273e4e4f4e6 ----------------------------------------------------------------------- commit 30f143a1e9104ff3cefdcdd3f8470dc6ec120985 Author: Michael M Slusarz <[email protected]> Date: Wed Aug 7 15:44:38 2013 -0600 phpdoc framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php | 4 ++-- framework/Stream_Filter/lib/Horde/Stream/Filter/Null.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/30f143a1e9104ff3cefdcdd3f8470dc6ec120985 ----------------------------------------------------------------------- commit 21bc7a682d0771fa0f55996664aaefdce0a467bb Author: Michael M Slusarz <[email protected]> Date: Wed Aug 7 17:06:05 2013 -0600 [mms] Ensure Registry exists in error handler before attempting to access it (Bug #12540). framework/Core/lib/Horde/ErrorHandler.php | 2 +- framework/Core/package.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/21bc7a682d0771fa0f55996664aaefdce0a467bb ----------------------------------------------------------------------- commit 912004ec0155586696b1eafd9593feea44f64346 Author: Michael M Slusarz <[email protected]> Date: Wed Aug 7 17:17:04 2013 -0600 [mms] Translate mailbox names from UTF7-IMAP -> UTF-8 in return from Horde_Imap_Client_Base#getMetadata() (Bug #12541). framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 83 +++++++++------- framework/Imap_Client/package.xml | 4 +- 2 files changed, 50 insertions(+), 37 deletions(-) http://git.horde.org/horde-git/-/commit/912004ec0155586696b1eafd9593feea44f64346 ----------------------------------------------------------------------- commit e538618d502705cf12e3be130790457be4656479 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 19:22:41 2013 -0400 Improve logging output here. .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e538618d502705cf12e3be130790457be4656479 ----------------------------------------------------------------------- commit 1b5bbeee8be65df2c3b1256b528a069c28035a6a Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 19:23:06 2013 -0400 Fix sync loop when no history exists yet. History returns a boolean when no history at all is found ( as would be the case on a new install). Need to cast $modseq to int to avoid the activesync server thinking it's a loss of state or change from timestamps to modseq. Related to Bug: 12531 framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/1b5bbeee8be65df2c3b1256b528a069c28035a6a ----------------------------------------------------------------------- commit 81d12a81627eebc69ee6ba54fa922678d8929b31 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 19:38:29 2013 -0400 BFN framework/ActiveSync/package.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/81d12a81627eebc69ee6ba54fa922678d8929b31 ----------------------------------------------------------------------- commit 65f5b72402e4493a2f81644a4b6b5f490acfb58e Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 23:57:17 2013 -0400 Remove unused protected method. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 20 --------------- 1 files changed, 0 insertions(+), 20 deletions(-) http://git.horde.org/horde-git/-/commit/65f5b72402e4493a2f81644a4b6b5f490acfb58e ----------------------------------------------------------------------- commit 588989f8297dd64d22d93858fc6687395faf5e24 Author: Michael J Rubinsky <[email protected]> Date: Wed Aug 7 23:58:04 2013 -0400 Always track the timestamp, even if using modseq. Bug: #12529 We need to have a timestamp for displaying in the UI. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 23 ++++++++------ 1 files changed, 13 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/588989f8297dd64d22d93858fc6687395faf5e24 ----------------------------------------------------------------------- commit 5a553b523c1b1cc009fd4d3c30f4feca81c3c884 Author: Michael J Rubinsky <[email protected]> Date: Thu Aug 8 00:03:51 2013 -0400 CHANGES, add migration file. .../Horde/ActiveSync/19_horde_activesync_addtimestamp.php | 16 +++++ framework/ActiveSync/package.xml | 14 +++-- 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 framework/ActiveSync/migration/Horde/ActiveSync/19_horde_activesync_addtimestamp.php http://git.horde.org/horde-git/-/commit/5a553b523c1b1cc009fd4d3c30f4feca81c3c884 ----------------------------------------------------------------------- commit 861169e8db28ee1b5232cd21b998a363c0b209c7 Author: Michael J Rubinsky <[email protected]> Date: Thu Aug 8 00:16:13 2013 -0400 Shorter variable name. horde/lib/Prefs/Special/Activesync.php | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) http://git.horde.org/horde-git/-/commit/861169e8db28ee1b5232cd21b998a363c0b209c7 ----------------------------------------------------------------------- commit c4f6d08c2555bf9b3f204a0110b9d127c9116802 Author: Michael J Rubinsky <[email protected]> Date: Thu Aug 8 00:17:52 2013 -0400 Better check for ensuring the device belongs to the user before wiping. horde/lib/Prefs/Special/Activesync.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/c4f6d08c2555bf9b3f204a0110b9d127c9116802 ----------------------------------------------------------------------- commit bf9ce5b7a47b35a777fe59949f19a9168f10a437 Merge: 669136f c4f6d08 Author: Michael J Rubinsky <[email protected]> Date: Thu Aug 8 00:22:12 2013 -0400 Merge branch 'master' into horde_5_2 Conflicts: framework/Core/package.xml horde/lib/Prefs/Special/Activesync.php framework/ActiveSync/lib/Horde/ActiveSync.php | 1 + framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 46 +-- .../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 5 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 8 +- framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 43 +-- .../Horde/ActiveSync/19_horde_activesync_addtimestamp.php | 16 + framework/ActiveSync/package.xml | 24 +- framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 2 +- framework/Core/lib/Horde/ErrorHandler.php | 2 +- framework/Core/package.xml | 2 +- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 83 +++-- framework/Imap_Client/package.xml | 4 +- framework/Mail/doc/Horde/Mail/UPGRADING | 12 + framework/Mail/lib/Horde/Mail/Rfc822/Address.php | 9 + framework/Mail/lib/Horde/Mail/Rfc822/List.php | 7 + framework/Mail/package.xml | 6 +- framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php | 4 +- framework/Stream_Filter/lib/Horde/Stream/Filter/Null.php | 4 +- horde/lib/Prefs/Special/Activesync.php | 30 +- 19 files changed, 181 insertions(+), 127 deletions(-) http://git.horde.org/horde-git/-/commit/bf9ce5b7a47b35a777fe59949f19a9168f10a437 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
