[commits] Horde branch nag_4_2 updated. 145a74d5104e3a4a3f65cbe41ce66eac109dc776

Michael J. Rubinsky mrubinsk at horde.org
Wed Nov 20 16:33:23 UTC 2013


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

from: 40e07c1bea93f664ec2cdc3d0d786c160127e1b7

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.
d9ef795 Attempt to unserialize using older strategy.
3432562 CHANGES
7b0c98f Add Horde_ActiveSync_Device::blocked
81a2578 Add ability to filter the list of devices on more than username.
2a4d231 CHANGES
0b68704 Log these as NOTICE
98e62ac Passwd_Driver: Fix password comparison when show_encryption is true
1f5f4af Horde_Auth: SHA256 hashes are 32 bytes long
07b0509 SqliteTest: Fix 'access to undeclared static property' error
7cdc6c5 AuthTest: Add support for testing show_encryption param
13b1d94 Horde_Auth_Testcase: Add SSHA256 test data
7e41754 Fix variable name
b7c7b9a Merge remote-tracking branch 'atj/master'
c323680 [mms] Fix parsing salted SHA256 entries (Adam James <adam.james at transitiv.co.uk>).
57aca33 Catch exceptions.
145a74d Merge branch 'master' into nag_4_2

Summary: http://github.com/horde/horde/compare/40e07c1bea93f664ec2cdc3d0d786c160127e1b7...145a74d5104e3a4a3f65cbe41ce66eac109dc776

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

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 d9ef7956f009fe0558f9bff8d3bdb36c522420a9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 19 10:05:32 2013 -0500

    Attempt to unserialize using older strategy.
    
    Prevents expensive resync of email collections.

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

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

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

commit 3432562f6447da3e02644fb86ad7bcb1a8f7f36e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 19 10:23:04 2013 -0500

    CHANGES

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

http://github.com/horde/horde/commit/3432562f6447da3e02644fb86ad7bcb1a8f7f36e
http://git.horde.org/horde-git/-/commit/3432562f6447da3e02644fb86ad7bcb1a8f7f36e

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

commit 7b0c98fd54cf1edae2a0648c44655737d90869ce
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 19 10:27:02 2013 -0500

    Add Horde_ActiveSync_Device::blocked
    
    Boolean property to allow marking a specific device as being
    blocked.

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

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

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

commit 81a2578dc38589ac4c22fb403a5300055bee845e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 19 10:27:54 2013 -0500

    Add ability to filter the list of devices on more than username.

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

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

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

commit 2a4d2316d410483cc518b519b3391a387a23d12d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 19 10:29:51 2013 -0500

    CHANGES

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

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

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

commit 0b68704e126aaba956e1ba4a11a5af10070afb9f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 19 10:51:34 2013 -0500

    Log these as NOTICE

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

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

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

commit 98e62acb3efca908f958156d32ecf63f5eec023c
Author: Adam James <adam.james at transitiv.co.uk>
Date:   Tue Nov 19 11:01:55 2013 +0000

    Passwd_Driver: Fix password comparison when show_encryption is true
    
    Stripping the encryption type from a password when show_encryption is
    true results in _comparePasswords() always raising an exception as the
    parameter is also passed to Horde_Auth::getCryptedPassword().

 passwd/lib/Driver.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/98e62acb3efca908f958156d32ecf63f5eec023c
http://git.horde.org/horde-git/-/commit/98e62acb3efca908f958156d32ecf63f5eec023c

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

commit 1f5f4afc2444a9e7a3ee0aff7f5ee0ebecaf393d
Author: Adam James <adam.james at transitiv.co.uk>
Date:   Tue Nov 19 13:50:29 2013 +0000

    Horde_Auth: SHA256 hashes are 32 bytes long

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

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

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

commit 07b0509083528ff6f6da13c74a51da4bdc292c62
Author: Adam James <adam.james at transitiv.co.uk>
Date:   Tue Nov 19 22:14:00 2013 +0000

    SqliteTest: Fix 'access to undeclared static property' error

 framework/Auth/test/Horde/Auth/Unit/Sql/Pdo/SqliteTest.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/07b0509083528ff6f6da13c74a51da4bdc292c62
http://git.horde.org/horde-git/-/commit/07b0509083528ff6f6da13c74a51da4bdc292c62

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

commit 7cdc6c54a9e269e99725f3a4cec222d6cc16f19a
Author: Adam James <adam.james at transitiv.co.uk>
Date:   Tue Nov 19 22:15:32 2013 +0000

    AuthTest: Add support for testing show_encryption param

 framework/Auth/test/Horde/Auth/Unit/AuthTest.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit 13b1d942c08000db296459bfaf6aa4d15c05f366
Author: Adam James <adam.james at transitiv.co.uk>
Date:   Tue Nov 19 22:17:01 2013 +0000

    Horde_Auth_Testcase: Add SSHA256 test data

 framework/Auth/test/Horde/Auth/TestCase.php |  Bin 1747 -> 2220 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/13b1d942c08000db296459bfaf6aa4d15c05f366
http://git.horde.org/horde-git/-/commit/13b1d942c08000db296459bfaf6aa4d15c05f366

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

commit 7e417546f3e3cba40773eee119cef9de7de77687
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 19 23:08:27 2013 -0700

    Fix variable name

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

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

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

commit b7c7b9ae62f96e8a8bbf0c7b138c104b510862ec
Merge: 7e41754 13b1d94
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 19 23:34:56 2013 -0700

    Merge remote-tracking branch 'atj/master'

 framework/Auth/lib/Horde/Auth.php                          |    2 +-
 framework/Auth/test/Horde/Auth/TestCase.php                |  Bin 1747 -> 2220 bytes
 framework/Auth/test/Horde/Auth/Unit/AuthTest.php           |    4 ++--
 framework/Auth/test/Horde/Auth/Unit/Sql/Pdo/SqliteTest.php |    2 +-
 passwd/lib/Driver.php                                      |    4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)

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

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

commit c323680e5ef8ef60ec41c05f18ecd49949955804
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 19 23:38:44 2013 -0700

    [mms] Fix parsing salted SHA256 entries (Adam James <adam.james at transitiv.co.uk>).

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

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

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

commit 57aca3385b56388b7cea5c59346d16ececb0873d
Author: Jan Schneider <jan at horde.org>
Date:   Thu Nov 14 15:11:53 2013 +0100

    Catch exceptions.
    
    Conflicts:
    	kronolith/lib/Kronolith.php

 kronolith/templates/edit/edit.inc |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/57aca3385b56388b7cea5c59346d16ececb0873d
http://git.horde.org/horde-git/-/commit/57aca3385b56388b7cea5c59346d16ececb0873d

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

commit 145a74d5104e3a4a3f65cbe41ce66eac109dc776
Merge: 40e07c1 57aca33
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Nov 20 11:31:20 2013 -0500

    Merge branch 'master' into nag_4_2

 framework/ActiveSync/doc/Horde/ActiveSync/UPGRADING               |   65 -----
 framework/ActiveSync/lib/Horde/ActiveSync.php                     |   13 +
 framework/ActiveSync/lib/Horde/ActiveSync/Device.php              |    5 +
 framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php         |   23 +-
 framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php        |    8 +
 framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php         |   13 +-
 framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php           |   13 +-
 framework/ActiveSync/package.xml                                  |   30 ++-
 .../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php |    2 +-
 framework/Auth/lib/Horde/Auth.php                                 |    2 +-
 framework/Auth/package.xml                                        |    4 +-
 framework/Auth/test/Horde/Auth/TestCase.php                       |  Bin 1747 -> 2220 bytes
 framework/Auth/test/Horde/Auth/Unit/AuthTest.php                  |    4 +-
 framework/Auth/test/Horde/Auth/Unit/Sql/Pdo/SqliteTest.php        |    2 +-
 framework/Core/lib/Horde/Core/Factory/Mail.php                    |    4 +-
 framework/Core/package.xml                                        |   19 +-
 framework/Crypt/package.xml                                       |   26 ++-
 framework/Kolab_Format/package.xml                                |   21 ++-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php     |    4 +-
 framework/Kolab_Storage/package.xml                               |    4 +-
 framework/Pear/package.xml                                        |   23 ++-
 framework/Smtp/lib/Horde/Smtp.php                                 |    2 +-
 framework/Text_Filter/package.xml                                 |   19 +-
 framework/Text_Filter_Jsmin/package.xml                           |   21 ++-
 imp/docs/CHANGES                                                  |    8 +-
 imp/docs/RELEASE_NOTES                                            |   14 +-
 imp/lib/Application.php                                           |    2 +-
 imp/lib/Mime/Viewer/Pgp.php                                       |   52 ++--
 imp/package.xml                                                   |   23 ++-
 kronolith/templates/edit/edit.inc                                 |   12 +-
 passwd/lib/Driver.php                                             |    4 +-
 turba/lib/Driver/Kolab.php                                        |    6 +
 whups/docs/CHANGES                                                |    6 +
 whups/docs/RELEASE_NOTES                                          |    4 +-
 whups/package.xml                                                 |   26 ++-
 35 files changed, 303 insertions(+), 181 deletions(-)

http://github.com/horde/horde/commit/145a74d5104e3a4a3f65cbe41ce66eac109dc776
http://git.horde.org/horde-git/-/commit/145a74d5104e3a4a3f65cbe41ce66eac109dc776




More information about the commits mailing list