[commits] Horde branch FRAMEWORK_5_2 updated. 9ff0193119a349f1e9d3c225ed7b1ea9a94d9d21

[Jan Schneider]

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

from: 07ae17408037eb63c40dbf94ca5bfe675b2372ab

0a57efa Move disabling of auth methods to init phase.
9ff0193 Fix DAV URLs when using authusername hooks.

Summary: http://github.com/horde/horde/compare/07ae17408037eb63c40dbf94ca5bfe675b2372ab...9ff0193119a349f1e9d3c225ed7b1ea9a94d9d21

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

commit 0a57efa0b717cdd292102d8e3b07644ada17bd17
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 7 17:43:17 2015 +0100

    Move disabling of auth methods to init phase.
    
    The authentication process is requesting the authentication application whether
    it supports authentication at all. This may happen before IMP has been
    initialized, i.e. before we know if the 'admin' features exist. Experienced
    during RPC authentication.
    
    Conflicts:
    	imp/lib/Application.php

 imp/lib/Application.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

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

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

commit 9ff0193119a349f1e9d3c225ed7b1ea9a94d9d21
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jan 7 17:53:49 2015 +0100

    Fix DAV URLs when using authusername hooks.
    
    Conflicts:
    	kronolith/lib/Api.php

 kronolith/lib/Api.php                     |   14 +++++++++--
 kronolith/lib/Application.php             |   22 +++++++++++--------
 kronolith/lib/Calendar/External/Tasks.php |    4 +-
 kronolith/lib/Calendar/Internal.php       |    4 +-
 kronolith/lib/Form/EditCalendar.php       |   26 ++++++++++++----------
 kronolith/templates/chunks/calendar.php   |    2 +-
 nag/lib/Api.php                           |   24 +++++++++++---------
 nag/lib/Application.php                   |   18 +++++++++------
 nag/lib/Nag.php                           |    6 ++--
 turba/lib/Api.php                         |   26 +++++++++++-----------
 turba/lib/Application.php                 |   33 +++++++++++++++++++++--------
 turba/lib/Form/EditAddressBook.php        |   31 ++++++++++++++++----------
 12 files changed, 126 insertions(+), 84 deletions(-)

http://github.com/horde/horde/commit/9ff0193119a349f1e9d3c225ed7b1ea9a94d9d21