Merge branch 'instance/fid' into instance/fid_bbi (dfed91d9) · 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
dfed91d9

Commit dfed91d9 authored 1 year ago by

Robert Lange

Downloads
- Plain Diff

Merge branch 'instance/fid' into instance/fid_bbi

parents f3b3741e a6922c01

Branches

Tags v3.0.3

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

module/fid/src/Controller/UserController.php 7 additions, 4 deletions

module/fid/src/Controller/UserController.php
module/finc/src/finc/Controller/CustomTraits/GviRecordTrait.php 10 additions, 7 deletions

.../finc/src/finc/Controller/CustomTraits/GviRecordTrait.php
module/finc/src/finc/Controller/CustomTraits/PdaTrait.php 5 additions, 2 deletions

module/finc/src/finc/Controller/CustomTraits/PdaTrait.php
module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php 26 additions, 6 deletions

module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
themes/fid/templates/myresearch/databases.phtml 1 addition, 1 deletion

themes/fid/templates/myresearch/databases.phtml
themes/finc/js/common-finc.js 2 additions, 0 deletions

themes/finc/js/common-finc.js
themes/finc/scss/_customVariables.scss 66 additions, 135 deletions

themes/finc/scss/_customVariables.scss
themes/finc/scss/components/_modal.scss 5 additions, 0 deletions

themes/finc/scss/components/_modal.scss
themes/finc/scss/components/_offcanvas.scss 33 additions, 3 deletions

themes/finc/scss/components/_offcanvas.scss

with 155 additions and 158 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