Merge branch 'release-2.3'
Conflicts: themes/bootstrap3/templates/browse/home.phtml themes/bootstrap3/templates/record/view.phtml themes/bootstrap3/templates/search/newitem.phtml themes/bootstrap3/templates/search/results.phtml
Showing
- themes/bootstrap3/js/advanced_search.js 1 addition, 1 deletionthemes/bootstrap3/js/advanced_search.js
- themes/bootstrap3/js/vendor/bootlint.min.js 1480 additions, 0 deletionsthemes/bootstrap3/js/vendor/bootlint.min.js
- themes/bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml 6 additions, 4 deletions.../bootstrap3/templates/Recommend/ResultGoogleMapAjax.phtml
- themes/bootstrap3/templates/admin/tags/checkbox.phtml 6 additions, 4 deletionsthemes/bootstrap3/templates/admin/tags/checkbox.phtml
- themes/bootstrap3/templates/alphabrowse/home.phtml 78 additions, 82 deletionsthemes/bootstrap3/templates/alphabrowse/home.phtml
- themes/bootstrap3/templates/browse/home.phtml 65 additions, 61 deletionsthemes/bootstrap3/templates/browse/home.phtml
- themes/bootstrap3/templates/cart/cart.phtml 6 additions, 4 deletionsthemes/bootstrap3/templates/cart/cart.phtml
- themes/bootstrap3/templates/cart/contents.phtml 6 additions, 4 deletionsthemes/bootstrap3/templates/cart/contents.phtml
- themes/bootstrap3/templates/collection/view.phtml 39 additions, 39 deletionsthemes/bootstrap3/templates/collection/view.phtml
- themes/bootstrap3/templates/combined/results-list.phtml 1 addition, 1 deletionthemes/bootstrap3/templates/combined/results-list.phtml
- themes/bootstrap3/templates/layout/layout.phtml 1 addition, 3 deletionsthemes/bootstrap3/templates/layout/layout.phtml
- themes/bootstrap3/templates/primo/advanced.phtml 55 additions, 42 deletionsthemes/bootstrap3/templates/primo/advanced.phtml
- themes/bootstrap3/templates/record/email.phtml 10 additions, 6 deletionsthemes/bootstrap3/templates/record/email.phtml
- themes/bootstrap3/templates/record/storageretrievalrequest.phtml 12 additions, 8 deletions...bootstrap3/templates/record/storageretrievalrequest.phtml
- themes/bootstrap3/templates/record/view.phtml 41 additions, 41 deletionsthemes/bootstrap3/templates/record/view.phtml
- themes/bootstrap3/templates/search/advanced/checkbox-filters.phtml 6 additions, 4 deletions...otstrap3/templates/search/advanced/checkbox-filters.phtml
- themes/bootstrap3/templates/search/advanced/eds.phtml 12 additions, 8 deletionsthemes/bootstrap3/templates/search/advanced/eds.phtml
- themes/bootstrap3/templates/search/advanced/layout.phtml 43 additions, 41 deletionsthemes/bootstrap3/templates/search/advanced/layout.phtml
- themes/bootstrap3/templates/search/advanced/ranges.phtml 17 additions, 17 deletionsthemes/bootstrap3/templates/search/advanced/ranges.phtml
- themes/bootstrap3/templates/search/advanced/solr.phtml 2 additions, 2 deletionsthemes/bootstrap3/templates/search/advanced/solr.phtml
Please register or sign in to comment