Merge branch 'master' into favorites-test
Showing
- config/vufind/Primo.ini 29 additions, 10 deletionsconfig/vufind/Primo.ini
- config/vufind/httpd-vufind.conf 5 additions, 0 deletionsconfig/vufind/httpd-vufind.conf
- config/vufind/permissions.ini 8 additions, 0 deletionsconfig/vufind/permissions.ini
- languages/de.ini 3 additions, 3 deletionslanguages/de.ini
- module/VuFind/src/VuFind/Config/Upgrade.php 76 additions, 1 deletionmodule/VuFind/src/VuFind/Config/Upgrade.php
- module/VuFind/src/VuFind/Controller/AbstractRecord.php 3 additions, 30 deletionsmodule/VuFind/src/VuFind/Controller/AbstractRecord.php
- module/VuFind/src/VuFind/Controller/MyResearchController.php 9 additions, 0 deletionsmodule/VuFind/src/VuFind/Controller/MyResearchController.php
- module/VuFind/src/VuFind/ILS/Driver/DAIA.php 1 addition, 2 deletionsmodule/VuFind/src/VuFind/ILS/Driver/DAIA.php
- module/VuFind/src/VuFind/RecordTab/PluginManager.php 57 additions, 25 deletionsmodule/VuFind/src/VuFind/RecordTab/PluginManager.php
- module/VuFind/src/VuFind/Search/Factory/PrimoBackendFactory.php 61 additions, 32 deletions.../VuFind/src/VuFind/Search/Factory/PrimoBackendFactory.php
- module/VuFind/src/VuFind/Search/Primo/InjectOnCampusListener.php 130 additions, 0 deletions...VuFind/src/VuFind/Search/Primo/InjectOnCampusListener.php
- module/VuFind/src/VuFind/Search/Primo/PrimoPermissionHandler.php 312 additions, 0 deletions...VuFind/src/VuFind/Search/Primo/PrimoPermissionHandler.php
- module/VuFind/tests/fixtures/configs/permissions/Primo.ini 179 additions, 0 deletionsmodule/VuFind/tests/fixtures/configs/permissions/Primo.ini
- module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php 29 additions, 1 deletion...nd/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
- module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/OnCampusListenerTest.php 247 additions, 0 deletions...ests/src/VuFindTest/Search/Primo/OnCampusListenerTest.php
- module/VuFind/tests/unit-tests/src/VuFindTest/Search/Primo/PrimoPermissionHandlerTest.php 920 additions, 0 deletions...rc/VuFindTest/Search/Primo/PrimoPermissionHandlerTest.php
- module/VuFindTheme/Module.php 1 addition, 1 deletionmodule/VuFindTheme/Module.php
- public/index.php 13 additions, 3 deletionspublic/index.php
- themes/bootstrap3/templates/admin/tags/manage.phtml 1 addition, 0 deletionsthemes/bootstrap3/templates/admin/tags/manage.phtml
- themes/bootstrap3/templates/header.phtml 2 additions, 2 deletionsthemes/bootstrap3/templates/header.phtml
Please register or sign in to comment