[commits] Horde branch FRAMEWORK_5_2 updated. 4c303bf0795ce23bf960063116a92c2cfc1be17c

[Jan Schneider]

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

from: 40ec90759c5506032fb6377b4f201c5e820c9e9f

31e4786 Enable purge checkbox if user has delete permissions.
4c303bf [jan] Enable purge calendar checkbox if user has delete permissions.

Summary: http://github.com/horde/horde/compare/40ec90759c5506032fb6377b4f201c5e820c9e9f...4c303bf0795ce23bf960063116a92c2cfc1be17c

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

commit 31e47865265f103061781fa88591c8c467db3297
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 30 15:12:17 2015 +0200

    Enable purge checkbox if user has delete permissions.
    
    Conflicts:
    	kronolith/lib/Calendar/Internal.php

 kronolith/js/kronolith.js           |    3 +++
 kronolith/lib/Calendar/Internal.php |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/31e47865265f103061781fa88591c8c467db3297

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

commit 4c303bf0795ce23bf960063116a92c2cfc1be17c
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 30 17:15:40 2015 +0200

    [jan] Enable purge calendar checkbox if user has delete permissions.

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

http://github.com/horde/horde/commit/4c303bf0795ce23bf960063116a92c2cfc1be17c