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

Commit 15c954cf authored 4 years ago by

Dorian Merz

Downloads
- Plain Diff

Merge branch 'master' into instance/fid

parents 3d53a81a b0877275

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

local/languages/de.ini 7 additions, 25 deletions

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

local/languages/en.ini
module/finc/src/finc/Controller/MyResearchController.php 2 additions, 1 deletion

module/finc/src/finc/Controller/MyResearchController.php
module/finc/src/finc/RecordDriver/SolrAI.php 13 additions, 3 deletions

module/finc/src/finc/RecordDriver/SolrAI.php
themes/finc/js/lightbox.js 95 additions, 10 deletions

themes/finc/js/lightbox.js
themes/finc/scss/compiled.scss 4 additions, 0 deletions

themes/finc/scss/compiled.scss
themes/finc/templates/myresearch/account.phtml 22 additions, 0 deletions

themes/finc/templates/myresearch/account.phtml
themes/finc/templates/myresearch/newpassword.phtml 2 additions, 1 deletion

themes/finc/templates/myresearch/newpassword.phtml

with 151 additions and 56 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