Skip to content
Snippets Groups Projects
  1. Jul 17, 2015
  2. Jul 16, 2015
  3. Jul 13, 2015
  4. Jul 09, 2015
  5. Jul 08, 2015
  6. Jul 07, 2015
    • André Lahmann's avatar
      Merge branch 'master' into issue/5404 · 02c8a227
      André Lahmann authored
      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
      02c8a227
    • Claas Kazzer's avatar
      refs #5408: · 116c1740
      Claas Kazzer authored and André Lahmann's avatar André Lahmann committed
      * adapted foundation5 theme to vufind-org/master/33505585
  7. Jul 01, 2015
  8. Jun 30, 2015
  9. Jun 26, 2015
  10. Jun 25, 2015
  11. Jun 24, 2015
    • André Lahmann's avatar
      refs #5425: · d6e751a7
      André Lahmann authored
      * 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
      d6e751a7
  12. Jun 23, 2015