Merge branch 'master' into instance/fid (80dce300) · 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
80dce300

Commit 80dce300 authored 4 years ago by

Dorian Merz

Downloads
- Plain Diff

Merge branch 'master' into instance/fid

parents f95ea3c4 572925fa

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
Gruntfile.js 18 additions, 3 deletions

Gruntfile.js
module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php 3 additions, 1 deletion

module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
themes/de_15/scss/print.scss 0 additions, 175 deletions

themes/de_15/scss/print.scss
themes/finc/css/.gitignore 0 additions, 1 deletion

themes/finc/css/.gitignore
themes/finc/scss/compiled.scss 31 additions, 0 deletions

themes/finc/scss/compiled.scss
themes/finc/templates/Helpers/nestedList.phtml 8 additions, 0 deletions

themes/finc/templates/Helpers/nestedList.phtml
themes/finc/templates/RecordDriver/DefaultRecord/data-rvkNotation.phtml 13 additions, 13 deletions

...mplates/RecordDriver/DefaultRecord/data-rvkNotation.phtml
themes/finc/templates/RecordDriver/SolrMarc/data-allSubjectHeadingsWithExtended.phtml 18 additions, 0 deletions

...Driver/SolrMarc/data-allSubjectHeadingsWithExtended.phtml
themes/finc/templates/search/results.phtml 0 additions, 18 deletions

themes/finc/templates/search/results.phtml
themes/finc/theme.config.php 0 additions, 1 deletion

themes/finc/theme.config.php

with 93 additions and 212 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