[commits] Horde branch turba_4_2 updated. 4cce2a544dbc0ad85b9e8f81ea15682d4f5363b8

Michael J. Rubinsky mrubinsk at horde.org
Wed Nov 20 16:34:22 UTC 2013


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

from: ebbd8b0d923b50df10b3125545cad7dc8402048e

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.
4cce2a5 Merge branch 'master' into turba_4_2

Summary: http://github.com/horde/horde/compare/ebbd8b0d923b50df10b3125545cad7dc8402048e...4cce2a544dbc0ad85b9e8f81ea15682d4f5363b8

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

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 4cce2a544dbc0ad85b9e8f81ea15682d4f5363b8
Merge: ebbd8b0 57aca33
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Nov 20 11:31:01 2013 -0500

    Merge branch 'master' into turba_4_2

 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                           |   12 ++++--
 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/Smtp/lib/Horde/Smtp.php                          |    2 +-
 kronolith/templates/edit/edit.inc                          |   12 +++++--
 passwd/lib/Driver.php                                      |    4 ++-
 15 files changed, 91 insertions(+), 26 deletions(-)

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




More information about the commits mailing list