Merge remote-tracking branch 'origin/master' into error_codes
Conflicts: themes/bootstrap3/js/record.js
Showing
- config/vufind/Demo.ini 6 additions, 0 deletionsconfig/vufind/Demo.ini
- config/vufind/config.ini 2 additions, 1 deletionconfig/vufind/config.ini
- module/VuFind/config/module.config.php 3 additions, 0 deletionsmodule/VuFind/config/module.config.php
- module/VuFind/src/VuFind/ILS/Driver/Demo.php 37 additions, 10 deletionsmodule/VuFind/src/VuFind/ILS/Driver/Demo.php
- module/VuFind/src/VuFind/Resolver/Driver/Demo.php 87 additions, 0 deletionsmodule/VuFind/src/VuFind/Resolver/Driver/Demo.php
- module/VuFind/src/VuFindTest/Unit/UserCreationTrait.php 12 additions, 7 deletionsmodule/VuFind/src/VuFindTest/Unit/UserCreationTrait.php
- module/VuFind/tests/integration-tests/src/VuFindTest/Mink/BasicTest.php 28 additions, 0 deletions...tests/integration-tests/src/VuFindTest/Mink/BasicTest.php
- module/VuFind/tests/integration-tests/src/VuFindTest/Mink/IlsActionsTest.php 289 additions, 14 deletions.../integration-tests/src/VuFindTest/Mink/IlsActionsTest.php
- module/VuFind/tests/integration-tests/src/VuFindTest/Mink/LinkResolverTest.php 116 additions, 0 deletions...ntegration-tests/src/VuFindTest/Mink/LinkResolverTest.php
- themes/bootprint3/css/compiled.css 5 additions, 1 deletionthemes/bootprint3/css/compiled.css
- themes/bootstrap3/css/compiled.css 5 additions, 1 deletionthemes/bootstrap3/css/compiled.css
- themes/bootstrap3/js/record.js 2 additions, 2 deletionsthemes/bootstrap3/js/record.js
- themes/bootstrap3/js/vendor/bootstrap.min.js 4 additions, 4 deletionsthemes/bootstrap3/js/vendor/bootstrap.min.js
- themes/bootstrap3/less/bootstrap/badges.less 1 addition, 1 deletionthemes/bootstrap3/less/bootstrap/badges.less
- themes/bootstrap3/less/bootstrap/bootstrap.less 6 additions, 0 deletionsthemes/bootstrap3/less/bootstrap/bootstrap.less
- themes/bootstrap3/less/bootstrap/button-groups.less 3 additions, 2 deletionsthemes/bootstrap3/less/bootstrap/button-groups.less
- themes/bootstrap3/less/bootstrap/buttons.less 11 additions, 5 deletionsthemes/bootstrap3/less/bootstrap/buttons.less
- themes/bootstrap3/less/bootstrap/carousel.less 9 additions, 8 deletionsthemes/bootstrap3/less/bootstrap/carousel.less
- themes/bootstrap3/less/bootstrap/dropdowns.less 3 additions, 1 deletionthemes/bootstrap3/less/bootstrap/dropdowns.less
- themes/bootstrap3/less/bootstrap/forms.less 53 additions, 14 deletionsthemes/bootstrap3/less/bootstrap/forms.less
Please register or sign in to comment