[commits] Horde branch master updated. 07bcc2896ee2c96d2e8a925a71e706ef8489cadc

[Jan Schneider]

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

from: 9750646bb40892fc0fb14893c015a883a3b212fd

77eb0bd [jan] Don't show ACL context menu if ACL preferences are locked.
bdf96ad Check if ACLs are supported at all too.
0f63b6e Protect against infinite loop if expanding all mailboxes.
07bcc28 Update/fix changelog.

Summary: http://github.com/horde/horde/compare/9750646bb40892fc0fb14893c015a883a3b212fd...07bcc2896ee2c96d2e8a925a71e706ef8489cadc

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

commit 77eb0bd74f16ad455da24dd34f70fa02be912f76
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jun 5 14:55:38 2015 +0200

    [jan] Don't show ACL context menu if ACL preferences are locked.
    
    Conflicts:
    	imp/package.xml

 imp/lib/Dynamic/Mailbox.php |    5 +++++
 imp/package.xml             |   18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/77eb0bd74f16ad455da24dd34f70fa02be912f76

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

commit bdf96ad14bc43b94a0e6ff7ba4ce8ca3314ca3c7
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jun 5 15:04:24 2015 +0200

    Check if ACLs are supported at all too.

 imp/lib/Dynamic/Mailbox.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/bdf96ad14bc43b94a0e6ff7ba4ce8ca3314ca3c7

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

commit 0f63b6e05786c24e9eb813bc8b39ad631945a533
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 10 12:50:10 2015 +0200

    Protect against infinite loop if expanding all mailboxes.

 imp/js/base.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/0f63b6e05786c24e9eb813bc8b39ad631945a533

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

commit 07bcc2896ee2c96d2e8a925a71e706ef8489cadc
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 10 12:55:33 2015 +0200

    Update/fix changelog.

 imp/package.xml |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/07bcc2896ee2c96d2e8a925a71e706ef8489cadc