Conflicts:
	module/finc/src/finc/ILS/Driver/DAIA.php
	module/finc/src/finc/ILS/Driver/FincILS.php
	module/finc/src/finc/RecordDriver/SolrDefault.php
	module/finc/src/finc/RecordDriver/SolrMarcRemoteFinc.php
	themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
	themes/finc/templates/footer.phtml
	themes/foundation5/css/default.css
	themes/foundation5/css/foundation.css
	themes/foundation5/css/vendor/foundation.css
	themes/foundation5/css/vendor/normalize.css
	themes/foundation5/js/advanced_search.js
	themes/foundation5/js/advanced_search_eds.js
	themes/foundation5/js/common.js
	themes/foundation5/js/facets.js
	themes/foundation5/scss/default.scss
	themes/foundation5/scss/vendor/normalize.scss
	themes/foundation5/templates/Auth/AbstractBase/login.phtml
	themes/foundation5/templates/Auth/Database/create.phtml
	themes/foundation5/templates/Auth/Database/newpassword.phtml
	themes/foundation5/templates/Auth/Database/recovery.phtml
	themes/foundation5/templates/Auth/ILS/newpassword.phtml
	themes/foundation5/templates/Auth/MultiILS/loginfields.phtml
	themes/foundation5/templates/Auth/MultiILS/newpassword.phtml
	themes/foundation5/templates/Helpers/email-form-fields.phtml
	themes/foundation5/templates/Recommend/CatalogResults.phtml
	themes/foundation5/templates/Recommend/CollectionSideFacets.phtml
	themes/foundation5/templates/Recommend/RandomRecommend.phtml
	themes/foundation5/templates/Recommend/SideFacets.phtml
	themes/foundation5/templates/Recommend/SummonResults.phtml
	themes/foundation5/templates/Recommend/TopFacets.phtml
	themes/foundation5/templates/RecordDriver/EDS/result-list.phtml
	themes/foundation5/templates/RecordDriver/SolrDefault/list-entry.phtml
	themes/foundation5/templates/RecordDriver/SolrDefault/result-list.phtml
	themes/foundation5/templates/RecordDriver/SolrDefault/toolbar.phtml
	themes/foundation5/templates/RecordTab/hierarchytree.phtml
	themes/foundation5/templates/RecordTab/usercomments.phtml
	themes/foundation5/templates/Service/recaptcha.phtml
	themes/foundation5/templates/admin/maintenance/home.phtml
	themes/foundation5/templates/alphabrowse/home.phtml
	themes/foundation5/templates/author/home.phtml
	themes/foundation5/templates/browse/home.phtml
	themes/foundation5/templates/cart/email.phtml
	themes/foundation5/templates/cart/export.phtml
	themes/foundation5/templates/cart/save.phtml
	themes/foundation5/templates/feedback/form.phtml
	themes/foundation5/templates/install/fixdatabase.phtml
	themes/foundation5/templates/install/fixils.phtml
	themes/foundation5/templates/layout/layout.phtml
	themes/foundation5/templates/myresearch/account.phtml
	themes/foundation5/templates/myresearch/cataloglogin.phtml
	themes/foundation5/templates/myresearch/edit.phtml
	themes/foundation5/templates/myresearch/editlist.phtml
	themes/foundation5/templates/myresearch/fines.phtml
	themes/foundation5/templates/myresearch/menu.phtml
	themes/foundation5/templates/myresearch/newpassword.phtml
	themes/foundation5/templates/myresearch/profile.phtml
	themes/foundation5/templates/myresearch/recover.phtml
	themes/foundation5/templates/oai/home.phtml
	themes/foundation5/templates/primo/advanced.phtml
	themes/foundation5/templates/record/addtag.phtml
	themes/foundation5/templates/record/email.phtml
	themes/foundation5/templates/record/hold.phtml
	themes/foundation5/templates/record/illrequest.phtml
	themes/foundation5/templates/record/save.phtml
	themes/foundation5/templates/record/sms.phtml
	themes/foundation5/templates/record/storageretrievalrequest.phtml
	themes/foundation5/templates/search/advanced/layout.phtml
	themes/foundation5/templates/search/advanced/limit.phtml
	themes/foundation5/templates/search/advanced/ranges.phtml
	themes/foundation5/templates/search/advanced/solr.phtml
	themes/foundation5/templates/search/controls/sort.phtml
	themes/foundation5/templates/search/email.phtml
	themes/foundation5/templates/search/newitem.phtml
	themes/foundation5/templates/search/reserves.phtml
	themes/foundation5/templates/search/reservessearch.phtml
	themes/foundation5/templates/search/results.phtml
	themes/foundation5/templates/search/searchbox-topbar.phtml
	themes/foundation5/templates/search/searchbox.phtml
	themes/foundation5/templates/upgrade/getsourcedir.phtml
	themes/foundation5/templates/vudl/navigation.phtml
	themes/foundation5/templates/vudl/views/audio.phtml
	themes/foundation5/templates/vudl/views/download.phtml
	themes/foundation5/templates/vudl/views/video.phtml
	themes/foundation5/theme.config.php

Claas Kazzer authored 9 years ago and André Lahmann committed 9 years ago

* adapted foundation5 theme to vufind-org/master/33505585

* updating DAIA driver to latest version of finc/paia-driver->lahmann/paia-driver with proper date conversion support

* disabled solr autocomplete globally

Claas Kazzer authored 9 years ago and André Lahmann committed 9 years ago

* hotfix for erroneous breaks in search button and language selection double button (from refs #5408)

* removed legacy support from DAIA.php and FincILS.php
* removed legacy settings in DAIA.ini and FincILS.ini

* integrated latest code from finc/paia-driver->lahmann/paia-driver
* improved ILSException handling in DAIA.php
* improved statusCheck for daia/paia services in FincILS.php
* fixed bug in DAIA.php resulting from calling getStatuses() from FincILS for non multi-query requests

* bugfixing for isil->toArray() call in getURLs() of SolrMarcFincTrait
* bugfixing of SolrMarcFinc constructor

* disabled wikipedia content for authors

* deleted all sass-cache files already committed

* introduced recorddriver SolrMarcFinc
* introduced traits SolrMarcFincTrait and SolrDefaultFincTrait to reduce redundancy of recorddriver methods (especially for recorddrivers with fullrecord vs. without fullrecord)

Claas Kazzer authored 9 years ago and André Lahmann committed 9 years ago

* merging foundation5 updates from finc/pullrequest_foundation5 into master

refs #5396 replacing deprecated [LibraryGroup] section at config.ini by general settings at [InstitutionInfo]
* isil at [InstitutionInfo] is now a list instead of string
* first value will be primary library key
* add some annotations and todos at module/finc/src/finc/RecordDriver/SolrMarcRemoteFinc.php

Frank Morgner authored 9 years ago and André Lahmann committed 9 years ago

refs #5428 bugfixing replacing method  getILSIdentifier from SolrMarcRemoteFinc.php to SolrDefault.php

Gregor Gawol authored 9 years ago and André Lahmann committed 9 years ago

- change containertitle from hierarchy_parent_title to series

* added connection test to FincILS for daia and paia services
* autoconfigure ils test will now succeed (searched id=1)
* updated FincILS.ini with latest URLs for daia and paia services

* removed Redi-ResolverDriver from module/finc
* updated SolrMarc.php and SolrMarcRemote.php according to latest vufind-org/master commits

- Resolves VUFIND-1120.

When running a keyword search, then choosing an author hyperlink from the
results to run an author facet search, the next/previous links in the individual
results would be based on the initial keyword search, not the facet search.

This was for two reasons:
- the ResultScroller was not active in the AuthorController, which handles
author facet searches
- the ResultScroller retrieves the current search from the session to create
the scrolling links, and author facet searches were configured to not
be saved in the session

Correct these two issues in AuthorController, but only if next_prev_navigation
is enabled. Because AuthorController also handles SolrAuthorFacet searches
(searches that produce a list of authors, not a list of titles by a specific author)
and those results cannot be iterated through by a ResultScroller, we also have
to make an additional fix in the ResultScroller plugin to handle the case
where SolrAuthorFacet result is passed to create the ResultScroller, and
prevent it from being instantiated.

- Faster, less redundant code.

- Resolves VUFIND-1095

Fixed the Finnish translation for 'items'.

- This may be helpful if language-specific themes are needed; otherwise makes no real difference.