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

Commit 3b03b087 authored 4 years ago by

Dorian Merz

Downloads
- Plain Diff

Merge branch 'master' into instance/fid

parents 2b4beea6 f8a2f485

Branches

Tags instance/local/staging/20211104_113228

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

local/alpha/config/vufind/searches.ini 4 additions, 1 deletion

local/alpha/config/vufind/searches.ini
local/config/vufind/searches.ini 1 addition, 1 deletion

local/config/vufind/searches.ini
local/languages/de.ini 4 additions, 0 deletions

local/languages/de.ini
local/languages/en.ini 5 additions, 1 deletion

local/languages/en.ini
module/finc/config/module.config.php 3 additions, 1 deletion

module/finc/config/module.config.php
module/finc/src/finc/Controller/Plugin/NewItems.php 80 additions, 0 deletions

module/finc/src/finc/Controller/Plugin/NewItems.php
module/finc/src/finc/Controller/Plugin/NewItemsFactory.php 63 additions, 0 deletions

module/finc/src/finc/Controller/Plugin/NewItemsFactory.php
themes/finc/scss/compiled.scss 30 additions, 20 deletions

themes/finc/scss/compiled.scss
themes/finc/templates/layout/layout.phtml 21 additions, 19 deletions

themes/finc/templates/layout/layout.phtml
themes/finc/templates/search/newitem.phtml 32 additions, 33 deletions

themes/finc/templates/search/newitem.phtml
themes/finc/templates/search/searchbox.phtml 1 addition, 1 deletion

themes/finc/templates/search/searchbox.phtml

with 244 additions and 77 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