The branch "master" has been updated. The following is a summary of the commits.
from: a50d848733ac7c92d91343bca7f26cdcc7232b68 0526ff9 typo f2c4844 phpdoc a5cfa8c [mms] Fix checking the 'max_forward' permission (Bug #13568). 09947a2 Better permissions definitions Summary: http://github.com/horde/horde/compare/a50d848733ac7c92d91343bca7f26cdcc7232b68...09947a2dd9094fee7c60fd09d52743128e7ca7c3 ----------------------------------------------------------------------- commit 0526ff9e673badd8184281f77323ba7126c5c44e Author: Michael M Slusarz <[email protected]> Date: Wed Sep 17 01:51:31 2014 -0600 typo ingo/docs/UPGRADING | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://github.com/horde/horde/commit/0526ff9e673badd8184281f77323ba7126c5c44e ----------------------------------------------------------------------- commit f2c48445be4e8666ed312661fdee06eb33330c28 Author: Michael M Slusarz <[email protected]> Date: Wed Sep 17 01:53:35 2014 -0600 phpdoc imp/lib/Perms.php | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) http://github.com/horde/horde/commit/f2c48445be4e8666ed312661fdee06eb33330c28 ----------------------------------------------------------------------- commit a5cfa8c5bdc6e839de423dba60f835e63ead325e Author: Michael M Slusarz <[email protected]> Date: Wed Sep 17 01:58:13 2014 -0600 [mms] Fix checking the 'max_forward' permission (Bug #13568). Conflicts: ingo/docs/CHANGES ingo/package.xml ingo/docs/CHANGES | 1 + ingo/lib/Perms.php | 1 + ingo/package.xml | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) http://github.com/horde/horde/commit/a5cfa8c5bdc6e839de423dba60f835e63ead325e ----------------------------------------------------------------------- commit 09947a2dd9094fee7c60fd09d52743128e7ca7c3 Author: Michael M Slusarz <[email protected]> Date: Wed Sep 17 01:59:45 2014 -0600 Better permissions definitions Make this like IMP - it keeps the permission definitions together with the interpretation of the permissions ingo/lib/Perms.php | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) http://github.com/horde/horde/commit/09947a2dd9094fee7c60fd09d52743128e7ca7c3 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
