Merge branch 'master' into instance/adlr_link (ac2e0362) · 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
ac2e0362

Commit ac2e0362 authored 9 years ago by

André Lahmann

Downloads
- Plain Diff

Merge branch 'master' into instance/adlr_link

parents 4171faaf 6f6ac491

Branches

Tags

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

themes/finc/templates/RecordDriver/SolrDefault/core.phtml 5 additions, 3 deletions

themes/finc/templates/RecordDriver/SolrDefault/core.phtml
themes/finc/templates/RecordDriver/SolrDefault/result-list.phtml 9 additions, 11 deletions

...finc/templates/RecordDriver/SolrDefault/result-list.phtml
themes/finc/templates/collection/view.phtml 17 additions, 12 deletions

themes/finc/templates/collection/view.phtml
themes/finc/templates/record/view.phtml 11 additions, 7 deletions

themes/finc/templates/record/view.phtml
themes/finc/templates/search/searchbox.phtml 13 additions, 20 deletions

themes/finc/templates/search/searchbox.phtml
themes/foundation5/templates/RecordDriver/SolrDefault/core.phtml 1 addition, 1 deletion

...foundation5/templates/RecordDriver/SolrDefault/core.phtml
themes/foundation5/templates/RecordDriver/SolrDefault/result-list.phtml 8 additions, 8 deletions

...ion5/templates/RecordDriver/SolrDefault/result-list.phtml
themes/foundation5/templates/collection/view.phtml 8 additions, 11 deletions

themes/foundation5/templates/collection/view.phtml
themes/foundation5/templates/header.phtml 1 addition, 1 deletion

themes/foundation5/templates/header.phtml
themes/foundation5/templates/record/view.phtml 5 additions, 10 deletions

themes/foundation5/templates/record/view.phtml
themes/foundation5/templates/search/searchbox.phtml 8 additions, 6 deletions

themes/foundation5/templates/search/searchbox.phtml

with 86 additions and 90 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