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

Commit c000be1f authored 4 years ago by

Dorian Merz

Downloads
- Plain Diff

Merge branch 'instance/fid' into instance/fid_bbi

parents 8c5d2b80 d123b6bb

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

local/languages/de.ini 5 additions, 5 deletions

local/languages/de.ini
local/languages/en.ini 6 additions, 7 deletions

local/languages/en.ini
module/fid/src/Controller/CustomTraits/FidAcquisitionTrait.php 80 additions, 127 deletions

...e/fid/src/Controller/CustomTraits/FidAcquisitionTrait.php
module/fid/src/Controller/RecordController.php 4 additions, 0 deletions

module/fid/src/Controller/RecordController.php
module/fid/src/Hydrator/OrderHydrator.php 6 additions, 1 deletion

module/fid/src/Hydrator/OrderHydrator.php
module/fid/src/View/Helper/Root/GetIt.php 86 additions, 59 deletions

module/fid/src/View/Helper/Root/GetIt.php
module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php 5 additions, 8 deletions

module/finc/src/finc/RecordDriver/SolrMarcFincTrait.php
themes/fid/languages/fid/de.ini 1 addition, 0 deletions

themes/fid/languages/fid/de.ini
themes/fid/languages/fid/en.ini 1 addition, 0 deletions

themes/fid/languages/fid/en.ini
themes/fid/templates/fid/user/admin-orders.phtml 5 additions, 2 deletions

themes/fid/templates/fid/user/admin-orders.phtml
themes/finc/scss/compiled.scss 48 additions, 0 deletions

themes/finc/scss/compiled.scss
themes/finc/templates/RecordDriver/DefaultRecord/list-entry.phtml 1 addition, 1 deletion

...inc/templates/RecordDriver/DefaultRecord/list-entry.phtml
themes/finc/templates/layout/layout.phtml 16 additions, 12 deletions

themes/finc/templates/layout/layout.phtml

with 264 additions and 222 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