Merge branch 'master' of https://github.com/vufind-org/vufind
Showing
- config/vufind/config.ini 13 additions, 0 deletionsconfig/vufind/config.ini
- languages/en.ini 6 additions, 0 deletionslanguages/en.ini
- module/VuFind/config/module.config.php 1 addition, 0 deletionsmodule/VuFind/config/module.config.php
- module/VuFind/src/VuFind/Auth/AbstractBase.php 12 additions, 1 deletionmodule/VuFind/src/VuFind/Auth/AbstractBase.php
- module/VuFind/src/VuFind/Auth/CAS.php 3 additions, 1 deletionmodule/VuFind/src/VuFind/Auth/CAS.php
- module/VuFind/src/VuFind/Auth/ChoiceAuth.php 211 additions, 0 deletionsmodule/VuFind/src/VuFind/Auth/ChoiceAuth.php
- module/VuFind/src/VuFind/Auth/Manager.php 90 additions, 7 deletionsmodule/VuFind/src/VuFind/Auth/Manager.php
- module/VuFind/src/VuFind/Auth/Shibboleth.php 8 additions, 2 deletionsmodule/VuFind/src/VuFind/Auth/Shibboleth.php
- module/VuFind/src/VuFind/Controller/MyResearchController.php 15 additions, 1 deletionmodule/VuFind/src/VuFind/Controller/MyResearchController.php
- module/VuFind/src/VuFind/View/Helper/Root/Auth.php 88 additions, 4 deletionsmodule/VuFind/src/VuFind/View/Helper/Root/Auth.php
- module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ShibbolethTest.php 1 addition, 1 deletion.../integration-tests/src/VuFindTest/Auth/ShibbolethTest.php
- themes/blueprint/css/styles.css 20 additions, 1 deletionthemes/blueprint/css/styles.css
- themes/blueprint/templates/Auth/AbstractBase/login.phtml 20 additions, 6 deletionsthemes/blueprint/templates/Auth/AbstractBase/login.phtml
- themes/blueprint/templates/Auth/AbstractBase/logindesc.phtml 1 addition, 0 deletionsthemes/blueprint/templates/Auth/AbstractBase/logindesc.phtml
- themes/blueprint/templates/Auth/AbstractBase/loginfields.phtml 6 additions, 0 deletions...s/blueprint/templates/Auth/AbstractBase/loginfields.phtml
- themes/blueprint/templates/Auth/CAS/logindesc.phtml 2 additions, 0 deletionsthemes/blueprint/templates/Auth/CAS/logindesc.phtml
- themes/blueprint/templates/Auth/ChoiceAuth/login.phtml 13 additions, 0 deletionsthemes/blueprint/templates/Auth/ChoiceAuth/login.phtml
- themes/blueprint/templates/Auth/Database/logindesc.phtml 2 additions, 0 deletionsthemes/blueprint/templates/Auth/Database/logindesc.phtml
- themes/blueprint/templates/Auth/ILS/logindesc.phtml 2 additions, 0 deletionsthemes/blueprint/templates/Auth/ILS/logindesc.phtml
- themes/blueprint/templates/Auth/LDAP/logindesc.phtml 2 additions, 0 deletionsthemes/blueprint/templates/Auth/LDAP/logindesc.phtml
Please register or sign in to comment