[commits] Horde branch develop updated. ea2d52d90b5a624fc8207e9f9bd14aadc6662f38

Jan Schneider jan at horde.org
Mon Sep 5 13:53:06 UTC 2011


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

from: 6ac9db77c32b09c1ed70f9ee6de87cca7ea5e2ba

1464649 simplify
8175bae oops. We want the shares owned by $user, not current user.
6c52d2c Need the shares owned by $user, not current user.
924698e Delete all of the shares owned by $user, not just the default.
f291df2 fix equality check
0f439f7 wrap/comments
c2d9db9 add option to return recent images for a specific user in emebedded renderer
5f5c560 Fix method call.
89b45b5 The group list is set dynamically, no need to pre-set it at load time.
03fe38f No need to reload the group list here, it's already loaded when opening the calendar (Bug #10482).
4ba01aa [jan] Fix race condition when editing group permission in basic permission screen (Bug #10482).
b0e615f [jan] Add support for resetting passwords to LDAP driver.
622c838 [jan] Fix checking and updating shadow attributes in LDAP driver while using preauthenticate hooks.
6c87d23 Inherit correct class.
766aa86 Catch AD.
2cc09ad Revert "[jan] Fix checking and updating shadow attributes in LDAP driver while using preauthenticate hooks."
fdca99c Pass the "hooked" credentials to the parent driver.
ff50631 [jan] Fix updating users in LDAP while using preauthenticate hooks.
6443ba4 Todo
ea2d52d Merge branch 'master' into develop

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

commit 1464649379f8c76595a6ad935ba7696e4400f3e9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 3 21:01:24 2011 -0400

    simplify

 kronolith/lib/Application.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/1464649379f8c76595a6ad935ba7696e4400f3e9

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

commit 8175bae5a8bf81117da207a4f351bacd4fd33800
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 3 21:19:33 2011 -0400

    oops. We want the shares owned by $user, not current user.
    
    Bug: 10241

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

http://git.horde.org/horde-git/-/commit/8175bae5a8bf81117da207a4f351bacd4fd33800

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

commit 6c52d2c5d95c9826205fe9aae90e7377541e572e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 3 21:47:10 2011 -0400

    Need the shares owned by $user, not current user.
    
    Bug: 10241

 mnemo/lib/Application.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6c52d2c5d95c9826205fe9aae90e7377541e572e

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

commit 924698eb30c877c194012c2bea739645504a7843
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Sep 3 21:47:42 2011 -0400

    Delete all of the shares owned by $user, not just the default.
    
    Bug: 10241

 turba/lib/Application.php |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/924698eb30c877c194012c2bea739645504a7843

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

commit f291df24fc6088e86ec9899ad8615c64a0e95f9c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 4 15:05:22 2011 -0400

    fix equality check

 ansel/lib/View/EmbeddedRenderer/Mini.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/f291df24fc6088e86ec9899ad8615c64a0e95f9c

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

commit 0f439f72137eeadb298b5aa7485377274a703185
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 4 15:06:31 2011 -0400

    wrap/comments

 ansel/lib/Storage.php                    |    2 +-
 ansel/lib/View/EmbeddedRenderer/Mini.php |   50 +++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/0f439f72137eeadb298b5aa7485377274a703185

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

commit c2d9db9d7e605818de881c2bbdf85db7b1a699f7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Sep 4 15:06:48 2011 -0400

    add option to return recent images for a specific user in emebedded renderer

 ansel/lib/View/EmbeddedRenderer/Mini.php |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/c2d9db9d7e605818de881c2bbdf85db7b1a699f7

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

commit 5f5c560618e96be69fd489d239e2afb03fd6448b
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 13:41:18 2011 +0200

    Fix method call.

 kronolith/js/kronolith.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/5f5c560618e96be69fd489d239e2afb03fd6448b

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

commit 89b45b5c0fae0014b6806fe469c7411f43e99813
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 13:46:04 2011 +0200

    The group list is set dynamically, no need to pre-set it at load time.

 kronolith/templates/chunks/permissions.inc |   18 +++---------------
 1 files changed, 3 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/89b45b5c0fae0014b6806fe469c7411f43e99813

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

commit 03fe38f0ba184fac47dec7f7979e781a75cdbb0e
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 13:49:34 2011 +0200

    No need to reload the group list here, it's already loaded when opening the calendar (Bug #10482).

 kronolith/js/kronolith.js |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/03fe38f0ba184fac47dec7f7979e781a75cdbb0e

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

commit 4ba01aa8554f01e4e85786bd78da1bc68547f5b4
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 13:50:27 2011 +0200

    [jan] Fix race condition when editing group permission in basic permission screen (Bug #10482).

 kronolith/docs/CHANGES |    2 ++
 kronolith/package.xml  |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/4ba01aa8554f01e4e85786bd78da1bc68547f5b4

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

commit b0e615f42c380255a7e4b81c7cb3953f957dbb21
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 14:14:15 2011 +0200

    [jan] Add support for resetting passwords to LDAP driver.

 framework/Auth/lib/Horde/Auth/Ldap.php |   45 ++++++++++++++++++++++++++++++++
 framework/Auth/package.xml             |   12 ++++----
 2 files changed, 51 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/b0e615f42c380255a7e4b81c7cb3953f957dbb21

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

commit 622c8380135a5de637c42caf33a8a335af57bcfb
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 14:21:48 2011 +0200

    [jan] Fix checking and updating shadow attributes in LDAP driver while using preauthenticate hooks.

 framework/Auth/lib/Horde/Auth/Ldap.php |   36 ++++++++++++++++---------------
 framework/Auth/package.xml             |    2 +
 2 files changed, 21 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/622c8380135a5de637c42caf33a8a335af57bcfb

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

commit 6c87d2303952fc18c5ac0e5d49736ea1256683f7
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 14:24:52 2011 +0200

    Inherit correct class.

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

http://git.horde.org/horde-git/-/commit/6c87d2303952fc18c5ac0e5d49736ea1256683f7

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

commit 766aa86d25e3f305a076bcb55b50e372e4e60391
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 14:37:15 2011 +0200

    Catch AD.

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

http://git.horde.org/horde-git/-/commit/766aa86d25e3f305a076bcb55b50e372e4e60391

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

commit 2cc09ad7e744607503e939f4c63dccbc456fc010
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 14:54:50 2011 +0200

    Revert "[jan] Fix checking and updating shadow attributes in LDAP driver while using preauthenticate hooks."
    
    This is actually how the original hook was supposed to work. How awkward. And
    broken too.
    
    This reverts commit 622c8380135a5de637c42caf33a8a335af57bcfb.

 framework/Auth/lib/Horde/Auth/Ldap.php |   36 +++++++++++++++----------------
 framework/Auth/package.xml             |    2 -
 2 files changed, 17 insertions(+), 21 deletions(-)

http://git.horde.org/horde-git/-/commit/2cc09ad7e744607503e939f4c63dccbc456fc010

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

commit fdca99cd94a4567c6a56fb673ef4503068b75001
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 14:59:44 2011 +0200

    Pass the "hooked" credentials to the parent driver.
    
    No idea where this 'ldap' entry should come from either. Remove and pass both
    old and new credentials to the hook.

 framework/Core/lib/Horde/Core/Auth/Ldap.php |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/fdca99cd94a4567c6a56fb673ef4503068b75001

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

commit ff50631aefe228e0ada5f42296df9e8524e05842
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 15:06:30 2011 +0200

    [jan] Fix updating users in LDAP while using preauthenticate hooks.

 framework/Auth/lib/Horde/Auth/Ldap.php |    9 ++++++---
 framework/Auth/package.xml             |    2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/ff50631aefe228e0ada5f42296df9e8524e05842

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

commit 6443ba4a7a4fc12d821c1c3bf1936faf0dd78e23
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 15:07:03 2011 +0200

    Todo

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

http://git.horde.org/horde-git/-/commit/6443ba4a7a4fc12d821c1c3bf1936faf0dd78e23

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

commit ea2d52d90b5a624fc8207e9f9bd14aadc6662f38
Merge: 6ac9db7 6443ba4
Author: Jan Schneider <jan at horde.org>
Date:   Mon Sep 5 15:52:54 2011 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	kronolith/package.xml

 ansel/lib/Storage.php                       |    2 +-
 ansel/lib/View/EmbeddedRenderer/Mini.php    |   68 ++++++++++++++++++++++-----
 framework/Auth/lib/Horde/Auth/Ldap.php      |   64 ++++++++++++++++++++++++-
 framework/Auth/package.xml                  |   14 +++--
 framework/Auth/test/Horde/Auth/TestCase.php |  Bin 2053 -> 2042 bytes
 framework/Core/lib/Horde/Core/Auth/Ldap.php |   12 ++---
 kronolith/docs/CHANGES                      |    2 +
 kronolith/js/kronolith.js                   |    9 ++--
 kronolith/lib/Application.php               |    8 ++-
 kronolith/package.xml                       |    1 +
 kronolith/templates/chunks/permissions.inc  |   18 +------
 mnemo/lib/Application.php                   |    3 +-
 turba/lib/Application.php                   |   33 ++++++-------
 13 files changed, 161 insertions(+), 73 deletions(-)

http://git.horde.org/horde-git/-/commit/ea2d52d90b5a624fc8207e9f9bd14aadc6662f38




More information about the commits mailing list