There was an error fetching the commit references. Please try again later.
Merge remote-tracking branch 'origin/master' into autocomplete
Conflicts: themes/bootstrap3/js/autocomplete.js
Showing
- composer.json 2 additions, 7 deletionscomposer.json
- composer.lock 169 additions, 191 deletionscomposer.lock
- index-alphabetic-browse.bat 4 additions, 4 deletionsindex-alphabetic-browse.bat
- index-alphabetic-browse.sh 11 additions, 4 deletionsindex-alphabetic-browse.sh
- languages/pt-br.ini 1 addition, 1 deletionlanguages/pt-br.ini
- languages/pt.ini 1 addition, 1 deletionlanguages/pt.ini
- module/VuFind/sql/migrations/pgsql/3.0/001-modify-user-columns.sql 7 additions, 0 deletions...Find/sql/migrations/pgsql/3.0/001-modify-user-columns.sql
- module/VuFind/src/VuFind/Auth/CAS.php 2 additions, 1 deletionmodule/VuFind/src/VuFind/Auth/CAS.php
- module/VuFind/src/VuFind/Auth/LDAP.php 1 addition, 1 deletionmodule/VuFind/src/VuFind/Auth/LDAP.php
- module/VuFind/src/VuFind/Config/PluginFactory.php 7 additions, 0 deletionsmodule/VuFind/src/VuFind/Config/PluginFactory.php
- module/VuFind/src/VuFind/Controller/AbstractRecord.php 9 additions, 2 deletionsmodule/VuFind/src/VuFind/Controller/AbstractRecord.php
- module/VuFind/src/VuFind/Controller/CartController.php 7 additions, 9 deletionsmodule/VuFind/src/VuFind/Controller/CartController.php
- module/VuFind/src/VuFind/Controller/Plugin/DbUpgrade.php 33 additions, 6 deletionsmodule/VuFind/src/VuFind/Controller/Plugin/DbUpgrade.php
- module/VuFind/src/VuFind/Controller/Plugin/Favorites.php 2 additions, 1 deletionmodule/VuFind/src/VuFind/Controller/Plugin/Favorites.php
- module/VuFind/src/VuFind/ILS/Driver/MultiBackend.php 2 additions, 1 deletionmodule/VuFind/src/VuFind/ILS/Driver/MultiBackend.php
- module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php 1 addition, 1 deletionmodule/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php
- module/VuFind/src/VuFind/RecordDriver/AbstractBase.php 2 additions, 1 deletionmodule/VuFind/src/VuFind/RecordDriver/AbstractBase.php
- module/VuFind/src/VuFind/RecordDriver/SolrMarc.php 6 additions, 3 deletionsmodule/VuFind/src/VuFind/RecordDriver/SolrMarc.php
- module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php 6 additions, 0 deletions.../tests/integration-tests/src/VuFindTest/Mink/CartTest.php
- module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php 3 additions, 3 deletions...s/integration-tests/src/VuFindTest/Mink/FavoritesTest.php
Please register or sign in to comment