[commits] Horde branch develop updated. c2b921f4a7f7cee19f25ceb3cd49395cafe92560

[Jan Schneider]

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

from: de811ece6531cb5a53dbedefed39277c8065aea6

037cff2 Check directory before attempting to read file.
edd0c14 Show correct login fields.
c2b921f Merge branch 'master' into develop

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

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

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

commit c2b921f4a7f7cee19f25ceb3cd49395cafe92560
Merge: de811ec edd0c14
Author: Jan Schneider <jan at horde.org>
Date:   Tue Mar 27 15:23:21 2012 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	gollem/lib/Auth.php
    	gollem/package.xml

 gollem/docs/CHANGES |    4 ++--
 gollem/package.xml  |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

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