[commits] Horde branch imp_6_2 updated. feeb8cc12cbd81a8d205a36ab137182bb716d927

Jan Schneider jan at horde.org
Tue Nov 19 12:50:06 UTC 2013


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

from: 413e00bf8b6e918531014c5bf6519fe082d72886

6504571 Simplify/cleanup device initialization.
131c692 Clean up SETTINGS request handling.
808b6bc Not sure why we were clearning the device_agent string here.
7d433df Fix SQL syntax.
0aa07c8 [jan] Correctly translate display-name attribute of distribution lists.
cd52bc5 [jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder.
0af8c18 Add Kolab distributions lists.
cde0fb1 [jan] Fix distribution list support in Kolab driver.
e646281 This seems to work better with older versions of iOS.
c009f53 ws
4fd7cc7 Remove commented out code.
3af1b96 CHANGES
3851916 This hasn't been maintained.
ebe3498 Update package.xml filelist.
314553c Fix table name in test.
0aeeac5 Development mode for Horde_ActiveSync-2.9.1
cbdba3d Revert "[jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder."
e987319 Catch objects types not matching the data backend here.
ad9066f [jan] Don't try authentication to SMTP server if explicitly disabled (Bug #12830).
5026c17 Released Horde_Core-2.11.1
a288fba Development mode for Horde_Core-2.11.2
2f53257 Released Horde_Crypt-2.4.0
062b693 Development mode for Horde_Crypt-2.4.1
a1cd8db Released Horde_Kolab_Format-2.0.5
3c6c19c Development mode for Horde_Kolab_Format-2.0.6
b7a4b98 Released Horde_Pear-1.0.0alpha6
3912823 Development mode for Horde_Pear-1.0.0alpha7
74c93c7 Released Horde_Text_Filter_Jsmin-1.0.0
ee6c10f Development mode for Horde_Text_Filter_Jsmin-1.0.1
23b70c2 Released Horde_Text_Filter-2.2.0
6b36565 Development mode for Horde_Text_Filter-2.2.1
8129905 Add item.
3fefeef Released whups-3.0.0RC3
1182e5c Development mode for whups-3.0.0RC4
dbb8ef5 Prepare release.
0f9228d Released imp-6.1.6
6a983cb Development mode for imp-6.1.7
6eea37e Catch broken messages.
feeb8cc Merge branch 'master' into imp_6_2

Summary: http://github.com/horde/horde/compare/413e00bf8b6e918531014c5bf6519fe082d72886...feeb8cc12cbd81a8d205a36ab137182bb716d927

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

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

    Simplify/cleanup device initialization.

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

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

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

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

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

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

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

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

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

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

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

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

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

commit 7d433df632f4f3d139a1010f6e12cf55e6ce2eca
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Nov 17 12:48:26 2013 -0500

    Fix SQL syntax.

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

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

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

commit 0aa07c81f46c6a626f8b8f69673e4fe9b3460592
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 16:21:12 2013 +0100

    [jan] Correctly translate display-name attribute of distribution lists.

 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Distributionlist.php  |    5 +-
 .../lib/Horde/Kolab/Format/Xml/Type/String/NotEmpty.php           |   33 +++++
 framework/Kolab_Format/package.xml                                |   11 +-
 3 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/String/NotEmpty.php

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

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

commit cd52bc59ef7d5d04263496a1dc5c098e915ba511
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 16:24:42 2013 +0100

    [jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder.

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php |    4 +++-
 framework/Kolab_Storage/package.xml                           |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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

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

commit 0af8c18dfc959b626f01c603407cf7a77c168cff
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 16:29:57 2013 +0100

    Add Kolab distributions lists.
    
    Still doesn't work for some odd reason, contact objects work just fine.

 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

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

commit cde0fb12ece100ff0930ea33810d02246eba06a5
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 17:16:44 2013 +0100

    [jan] Fix distribution list support in Kolab driver.

 turba/config/backends.php  |    1 -
 turba/docs/CHANGES         |    1 +
 turba/lib/Driver.php       |    2 +-
 turba/lib/Driver/Kolab.php |  210 ++++++++++++++++++++++++++++---------------
 turba/lib/Driver/Share.php |   14 +++
 turba/lib/Driver/Sql.php   |    2 +-
 turba/package.xml          |   18 ++++-
 7 files changed, 170 insertions(+), 78 deletions(-)

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

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

commit e6462811a17cd4ffacdd49de0268ebcd42695ba2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 12:35:22 2013 -0500

    This seems to work better with older versions of iOS.

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

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

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

commit c009f537d157a83893a893b4b3644395d82bcab7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 12:36:05 2013 -0500

    ws

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

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

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

commit 4fd7cc7454618c4bde207c62d194dce172b9fd75
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 12:36:30 2013 -0500

    Remove commented out code.

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

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

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

commit 3af1b968a610d08361df0ab659a45b04e9d5f034
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 12:44:59 2013 -0500

    CHANGES

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

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

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

commit 38519166eb54c88ec6156452a14abc4a8d928b04
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 12:58:55 2013 -0500

    This hasn't been maintained.

 framework/ActiveSync/doc/Horde/ActiveSync/UPGRADING |   65 -------------------
 1 files changed, 0 insertions(+), 65 deletions(-)
 delete mode 100644 framework/ActiveSync/doc/Horde/ActiveSync/UPGRADING

http://github.com/horde/horde/commit/38519166eb54c88ec6156452a14abc4a8d928b04
http://git.horde.org/horde-git/-/commit/38519166eb54c88ec6156452a14abc4a8d928b04

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

commit ebe349891f2a99a972ee0c913424d3b291451d77
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 12:59:33 2013 -0500

    Update package.xml filelist.

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

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

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

commit 314553c72b20cbf6a9080d24df5aafc400e3ff62
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 13:05:32 2013 -0500

    Fix table name in test.

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

http://github.com/horde/horde/commit/314553c72b20cbf6a9080d24df5aafc400e3ff62
http://git.horde.org/horde-git/-/commit/314553c72b20cbf6a9080d24df5aafc400e3ff62

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

commit 0aeeac5967074a1a36bc51cf02917364a98814f1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Mon Nov 18 13:07:09 2013 -0500

    Development mode for Horde_ActiveSync-2.9.1

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

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

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

commit cbdba3d65570425d02a0d30b5890b92429f40e20
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 20:26:42 2013 +0100

    Revert "[jan] Only return requested type from Horde_Kolab_Storage_Data_Base#fetch() if different types are in the same folder."
    
    This would break reporting of errors from parsing the Kolab objects.
    
    This reverts commit cd52bc59ef7d5d04263496a1dc5c098e915ba511.

 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php |    4 +---
 framework/Kolab_Storage/package.xml                           |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

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

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

commit e987319924a9143e838721befcb6352658bbdccb
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 20:28:39 2013 +0100

    Catch objects types not matching the data backend here.

 turba/lib/Driver/Kolab.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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

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

commit ad9066f5c67e36b17eae627a6e819d7549a683fc
Author: Jan Schneider <jan at horde.org>
Date:   Mon Nov 18 20:55:32 2013 +0100

    [jan] Don't try authentication to SMTP server if explicitly disabled (Bug #12830).

 framework/Core/lib/Horde/Core/Factory/Mail.php |    4 +++-
 framework/Core/package.xml                     |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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

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

commit 5026c1731142db4df4dbcaabf7aa2e040795b57f
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:10:55 2013 +0100

    Released Horde_Core-2.11.1

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

http://github.com/horde/horde/commit/5026c1731142db4df4dbcaabf7aa2e040795b57f
http://git.horde.org/horde-git/-/commit/5026c1731142db4df4dbcaabf7aa2e040795b57f

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

commit a288fbabd043d17aef0ed5310f02b097dd639f17
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:10:55 2013 +0100

    Development mode for Horde_Core-2.11.2

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

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

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

commit 2f53257b3cffae50e3c3a54ff67a7791aa1941c5
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:14:12 2013 +0100

    Released Horde_Crypt-2.4.0

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

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

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

commit 062b69323e713a91a32c67a5ae52c354f7677428
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:14:13 2013 +0100

    Development mode for Horde_Crypt-2.4.1

 framework/Crypt/package.xml |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/062b69323e713a91a32c67a5ae52c354f7677428
http://git.horde.org/horde-git/-/commit/062b69323e713a91a32c67a5ae52c354f7677428

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

commit a1cd8db9d3b525b3e51db92da591b5437a0a5b3a
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:17:09 2013 +0100

    Released Horde_Kolab_Format-2.0.5

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

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

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

commit 3c6c19c6bbe818070e47c05f6483e8644492cec9
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:17:09 2013 +0100

    Development mode for Horde_Kolab_Format-2.0.6

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

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

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

commit b7a4b9845ff3e35135a609c6ef8d712110ac4e77
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:19:38 2013 +0100

    Released Horde_Pear-1.0.0alpha6

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

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

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

commit 39128237235c57079ddb27e4c4776cdd7efeee99
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:19:38 2013 +0100

    Development mode for Horde_Pear-1.0.0alpha7

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

http://github.com/horde/horde/commit/39128237235c57079ddb27e4c4776cdd7efeee99
http://git.horde.org/horde-git/-/commit/39128237235c57079ddb27e4c4776cdd7efeee99

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

commit 74c93c7bc488c21b64061d2ddcd3487bf5402a83
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:22:40 2013 +0100

    Released Horde_Text_Filter_Jsmin-1.0.0

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

http://github.com/horde/horde/commit/74c93c7bc488c21b64061d2ddcd3487bf5402a83
http://git.horde.org/horde-git/-/commit/74c93c7bc488c21b64061d2ddcd3487bf5402a83

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

commit ee6c10f8d7f448130d9bf3cf949b62820df37fd0
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:22:40 2013 +0100

    Development mode for Horde_Text_Filter_Jsmin-1.0.1

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

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

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

commit 23b70c2634714162b50e92ae24ff2105064fbebc
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:26:14 2013 +0100

    Released Horde_Text_Filter-2.2.0

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

http://github.com/horde/horde/commit/23b70c2634714162b50e92ae24ff2105064fbebc
http://git.horde.org/horde-git/-/commit/23b70c2634714162b50e92ae24ff2105064fbebc

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

commit 6b3656538a34225b99247838feb14ec2c42aa0c3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:26:14 2013 +0100

    Development mode for Horde_Text_Filter-2.2.1

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

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

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

commit 81299053c1fd2b4662ea229d9521bb0f337b54d8
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:28:24 2013 +0100

    Add item.

 whups/docs/RELEASE_NOTES |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/81299053c1fd2b4662ea229d9521bb0f337b54d8
http://git.horde.org/horde-git/-/commit/81299053c1fd2b4662ea229d9521bb0f337b54d8

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

commit 3fefeef416b57448244dac2de5fdf8244eb91656
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:31:06 2013 +0100

    Released whups-3.0.0RC3

 whups/docs/CHANGES        |    6 +++---
 whups/lib/Application.php |    2 +-
 whups/package.xml         |    5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

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

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

commit 1182e5cb5fea259ce86d984109b353b49d3c2e0b
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:31:15 2013 +0100

    Development mode for whups-3.0.0RC4

 whups/docs/CHANGES        |    6 ++++++
 whups/lib/Application.php |    2 +-
 whups/package.xml         |   21 +++++++++++++++------
 3 files changed, 22 insertions(+), 7 deletions(-)

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

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

commit dbb8ef50ba62345c51cdcb26cd2cdf3f86239963
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:33:33 2013 +0100

    Prepare release.

 imp/docs/RELEASE_NOTES |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

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

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

commit 0f9228d03141fc951de9dc589dd59f5ad602d1c8
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:37:22 2013 +0100

    Released imp-6.1.6

 imp/docs/CHANGES        |    6 +++---
 imp/lib/Application.php |    2 +-
 imp/package.xml         |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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

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

commit 6a983cb110a75707c269b689c9ead037da439515
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 12:37:31 2013 +0100

    Development mode for imp-6.1.7

 imp/docs/CHANGES        |    6 ++++++
 imp/lib/Application.php |    2 +-
 imp/package.xml         |   19 +++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

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

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

commit 6eea37eeb8af1a5d37cf934aaabed6f0cb8e7fe9
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 13:41:56 2013 +0100

    Catch broken messages.

 imp/lib/Mime/Viewer/Pgp.php |   52 ++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

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

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

commit feeb8cc12cbd81a8d205a36ab137182bb716d927
Merge: 413e00b 6eea37e
Author: Jan Schneider <jan at horde.org>
Date:   Tue Nov 19 13:48:48 2013 +0100

    Merge branch 'master' into imp_6_2
    
    Conflicts:
    	framework/Crypt/package.xml
    	imp/docs/CHANGES
    	imp/lib/Application.php
    	imp/lib/Mime/Viewer/Pgp.php
    	imp/package.xml

 framework/ActiveSync/doc/Horde/ActiveSync/UPGRADING               |   65 --
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   48 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Collections.php         |    8 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Device.php              |   58 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php   |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Settings.php    |   11 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php         |    3 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |    5 +-
 framework/ActiveSync/package.xml                                  |   26 +-
 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |    2 +-
 framework/Core/lib/Horde/Core/Factory/Mail.php                    |    4 +-
 framework/Core/package.xml                                        |   19 +-
 framework/Crypt/package.xml                                       |   25 +-
 .../Kolab_Format/lib/Horde/Kolab/Format/Xml/Distributionlist.php  |    5 +-
 .../lib/Horde/Kolab/Format/Xml/Type/String/NotEmpty.php           |   33 +
 framework/Kolab_Format/package.xml                                |   22 +-
 framework/Kolab_Storage/package.xml                               |    4 +-
 framework/Mime_Viewer/lib/Horde/Mime/Viewer/Syntaxhighlighter.php |    1 +
 framework/Pear/package.xml                                        |   19 +-
 framework/Text_Filter/package.xml                                 |   19 +-
 framework/Text_Filter_Jsmin/package.xml                           |   21 +-
 imp/docs/CHANGES                                                  |    7 +-
 imp/docs/RELEASE_NOTES                                            |   14 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |   52 +-
 imp/package.xml                                                   |   15 +-
 turba/config/backends.php                                         |    1 -
 turba/docs/CHANGES                                                |    1 +
 turba/lib/Driver.php                                              |    2 +-
 turba/lib/Driver/Kolab.php                                        |  216 +++--
 turba/lib/Driver/Share.php                                        |   14 +
 turba/lib/Driver/Sql.php                                          |    2 +-
 turba/package.xml                                                 |   18 +-
 whups/docs/CHANGES                                                |    6 +
 whups/docs/RELEASE_NOTES                                          |    4 +-
 whups/package.xml                                                 |   26 +-
 35 files changed, 499 insertions(+), 280 deletions(-)

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




More information about the commits mailing list