Merge branch 'master' into autocomplete (a1d8cec3) · Commits · ubl / finc / vufind · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

vufind
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

ubl
finc
vufind
Commits
a1d8cec3

Commit a1d8cec3 authored 9 years ago by

Demian Katz

Downloads
- Plain Diff

Merge branch 'master' into autocomplete

parents 1a0b8090 902417cd

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

config/vufind/config.ini 17 additions, 12 deletions

config/vufind/config.ini
languages/ca.ini 49 additions, 0 deletions

languages/ca.ini
module/VuFind/src/VuFind/Config/Upgrade.php 13 additions, 5 deletions

module/VuFind/src/VuFind/Config/Upgrade.php
module/VuFind/src/VuFind/Export.php 52 additions, 26 deletions

module/VuFind/src/VuFind/Export.php
module/VuFind/tests/integration-tests/src/VuFindTest/Mink/CartTest.php 20 additions, 9 deletions

.../tests/integration-tests/src/VuFindTest/Mink/CartTest.php
module/VuFind/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php 0 additions, 7 deletions

...nd/tests/unit-tests/src/VuFindTest/Config/UpgradeTest.php
module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php 45 additions, 8 deletions

module/VuFind/tests/unit-tests/src/VuFindTest/ExportTest.php
themes/bootstrap3/templates/cart/cart.phtml 3 additions, 3 deletions

themes/bootstrap3/templates/cart/cart.phtml
themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml 1 addition, 1 deletion

...bootstrap3/templates/myresearch/bulk-action-buttons.phtml
themes/bootstrap3/templates/search/bulk-action-buttons.phtml 1 addition, 1 deletion

themes/bootstrap3/templates/search/bulk-action-buttons.phtml

with 201 additions and 72 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment