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

There was an error fetching the commit references. Please try again later.

Commit edfe1f2d authored 4 years ago by

Dorian Merz

Downloads
- Plain Diff

Merge branch 'master' into instance/fid

parents 7705225b 8af86967

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

local/alpha/config/vufind/config.ini 3 additions, 1 deletion

local/alpha/config/vufind/config.ini
local/config/vufind/config.ini 3 additions, 1 deletion

local/config/vufind/config.ini
local/languages/de.ini 1 addition, 0 deletions

local/languages/de.ini
local/languages/en.ini 1 addition, 0 deletions

local/languages/en.ini
module/finc/src/finc/Controller/AmslResourceController.php 183 additions, 46 deletions

module/finc/src/finc/Controller/AmslResourceController.php
module/finc/src/finc/Controller/AmslResourceControllerFactory.php 2 additions, 1 deletion

...inc/src/finc/Controller/AmslResourceControllerFactory.php
module/finc/src/finc/Cover/Router.php 2 additions, 1 deletion

module/finc/src/finc/Cover/Router.php
themes/finc/js/channels.js 191 additions, 0 deletions

themes/finc/js/channels.js
themes/finc/js/sources-display.js 14 additions, 2 deletions

themes/finc/js/sources-display.js
themes/finc/scss/_customVariables.scss 3 additions, 0 deletions

themes/finc/scss/_customVariables.scss
themes/finc/scss/compiled.scss 35 additions, 26 deletions

themes/finc/scss/compiled.scss
themes/finc/templates/amsl/sources-list.phtml 31 additions, 3 deletions

themes/finc/templates/amsl/sources-list.phtml

with 469 additions and 81 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