Merge branch 'master' of https://github.com/vufind-org/vufind (af2a4881) · 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
af2a4881

Commit af2a4881 authored 10 years ago by

Chris Hallberg

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/vufind-org/vufind

Conflicts:
	module/VuFind/src/VuFind/Controller/AbstractBase.php

parents 0e6988dd a03d8044

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

config/vufind/LibGuides.ini 5 additions, 0 deletions

config/vufind/LibGuides.ini
module/VuFind/src/VuFind/Controller/AbstractBase.php 27 additions, 0 deletions

module/VuFind/src/VuFind/Controller/AbstractBase.php
module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php 15 additions, 15 deletions

module/VuFind/src/VuFind/ILS/Driver/ClaviusSQL.php
themes/blueprint/css/styles.css 5 additions, 1 deletion

themes/blueprint/css/styles.css
themes/blueprint/templates/search/controls/view.phtml 5 additions, 1 deletion

themes/blueprint/templates/search/controls/view.phtml
themes/bootprint/templates/search/controls/view.phtml 4 additions, 2 deletions

themes/bootprint/templates/search/controls/view.phtml
themes/bootstrap/templates/search/controls/view.phtml 1 addition, 1 deletion

themes/bootstrap/templates/search/controls/view.phtml

with 62 additions and 20 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