[commits] Horde branch master updated. edd0c143967f04b9e88899c4b4164c9bf8007140

[Jan Schneider]

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

from: 95c115e291a291d37790d233e4f237652b94eb4e

037cff2 Check directory before attempting to read file.
edd0c14 Show correct login fields.

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

commit 037cff2c394c0e267befd8d213b0f616077fc2d6
Author: Jan Schneider <jan at horde.org>
Date:   Thu Mar 22 16:00:16 2012 +0100

    Check directory before attempting to read file.

 gollem/view.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/037cff2c394c0e267befd8d213b0f616077fc2d6

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

commit edd0c143967f04b9e88899c4b4164c9bf8007140
Author: Jan Schneider <jan at horde.org>
Date:   Tue Mar 27 15:21:04 2012 +0200

    Show correct login fields.
    
    Don't show user name and password fields on login page if not required.
    Display 'loginparams' on login screen (Bug #11088).
    
    Conflicts:
    
    	gollem/docs/CHANGES
    	gollem/lib/Auth.php
    	gollem/package.xml

 gollem/docs/CHANGES        |    2 ++
 gollem/js/login.js         |   28 ++++++++++++++++++++++++++++
 gollem/lib/Application.php |   17 ++++++++++++++++-
 gollem/lib/Auth.php        |    6 +++---
 gollem/package.xml         |    4 ++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 gollem/js/login.js

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