Commits · ce2f4b7cc8e769f127c90c75c89236134e9144b7 · ubl / finc / vufind

Oct 15, 2014

Chris Hallberg authored 10 years ago

Conflicts:
	themes/bootstrap3/css/combined-search.css
	themes/bootstrap3/templates/combined/results.phtml
	themes/bootstrap3/templates/combined/stack-distributed.phtml
	themes/bootstrap3/templates/combined/stack-left.phtml
	themes/bootstrap3/templates/combined/stack-right.phtml

ce2f4b7c

Combined search css update. · 5c1b00f1
Chris Hallberg authored 10 years ago

5c1b00f1

Extend per column cart support to stack-left and stack-right. · 4e1fc608

Chris Hallberg authored 10 years ago

Conflicts:
	themes/bootstrap3/templates/combined/stack-left.phtml
	themes/bootstrap3/templates/combined/stack-right.phtml

4e1fc608

supportCart should be false by default. · 5f948985
Chris Hallberg authored 10 years ago

5f948985
Remove bulk code. · d17d135c
Chris Hallberg authored 10 years ago

d17d135c

Per column cart support checking and logic compression. · db755110

Chris Hallberg authored 10 years ago

Conflicts:
	module/VuFind/src/VuFind/Controller/CombinedController.php
	themes/bootstrap3/templates/combined/results-list.phtml
	themes/bootstrap3/templates/combined/results.phtml
	themes/bootstrap3/templates/combined/stack-distributed.phtml
	themes/bootstrap3/templates/combined/stack-left.phtml
	themes/bootstrap3/templates/combined/stack-right.phtml
	themes/bootstrap3/templates/search/list-list.phtml
	themes/bootstrap3/templates/search/results.phtml

db755110

We'll get this right eventually. · aeaaacb4
Demian Katz authored 10 years ago

aeaaacb4
Style fixes. · 5f3cc68b
Demian Katz authored 10 years ago

5f3cc68b
Merge branch 'release-2.3' · e2f40677
Demian Katz authored 10 years ago

e2f40677

Solr config adjustments. · 8ee52e20

Ere Maijala authored 10 years ago

- Added boolean dynamic field type to biblio schema (fixes bug: expected by existing deduplication listener).
- Fixed indentation of a couple of lines in biblio solrconfig.xml.

8ee52e20

Oct 14, 2014
- Duplicate ids in list-entry dropdowns fix. · 8596215f
  Chris Hallberg authored 10 years ago
  
  8596215f
- Duplicate ids in list-entry dropdowns fix. · 19645950
  Chris Hallberg authored 10 years ago
  
  19645950
- Checkstyles live at the conference. · dc48c09c
  Chris Hallberg authored 10 years ago
  
  dc48c09c
- More config cache tweaking. · 1977fa14
  Demian Katz authored 10 years ago
  
  1977fa14
- Updated dependencies. · 4625d7c3
  Demian Katz authored 10 years ago
  
  4625d7c3
- Merge branch 'release-2.3' · b95cb891
  Demian Katz authored 10 years ago
  
  b95cb891
- Fixed typos. · 9957a8ff
  Demian Katz authored 10 years ago
  
  9957a8ff
Oct 10, 2014
- Expanded tests. · 01bcc516
  Demian Katz authored 10 years ago
```
- Created dummy options/params/results for more realistic testing.
```
  01bcc516
- Optimization: do not try to load non-existent next page. · 13996f98
  Demian Katz authored 10 years ago
```
- Includes tests.
```
  13996f98
- Combined search padding adjustments. · db01db0e
  Chris Hallberg authored 10 years ago
  
  db01db0e
- Fixed bug: caching broke CLI tools. · b16fb7bb
  Demian Katz authored 10 years ago
  
  b16fb7bb
Oct 09, 2014
- Filled gaps in coverage. · 25722218
  Demian Katz authored 10 years ago
  
  25722218
- Merge branch 'master' of https://github.com/vufind-org/vufind · 1e4dbce8
  Chris Hallberg authored 10 years ago
  
  1e4dbce8
- Merge branch 'release-2.3' · 0e063ac5
  Chris Hallberg authored 10 years ago
```
Conflicts:
	themes/bootstrap3/templates/admin/maintenance/home.phtml
	themes/bootstrap3/templates/admin/statistics/home.phtml
	themes/bootstrap3/templates/myresearch/checkedout.phtml
	themes/bootstrap3/templates/myresearch/mylist.phtml
	themes/bootstrap3/templates/search/reservessearch.phtml
```
  0e063ac5
- Fixed inconsistency between @return and behavior. · d080941b
  Demian Katz authored 10 years ago
```
- Began test suite.
```
  d080941b
- Added tests. · 28d3318a
  Demian Katz authored 10 years ago
  
  28d3318a
- Proper columns in hierarchy tree. · 1750e6d8
  Chris Hallberg authored 10 years ago
  
  1750e6d8
- Merge branch 'release-2.3' of https://github.com/vufind-org/vufind into release-2.3 · ff58312a
  Chris Hallberg authored 10 years ago
  
  ff58312a
- Bootlint for User Comments. · 44f65b73
  Chris Hallberg authored 10 years ago
  
  44f65b73
- Italian translation fixes · 390d9236
  Andrea Marchitelli authored 10 years ago
  
  390d9236
- Style fix. · e712ee08
  Demian Katz authored 10 years ago
  
  e712ee08
- Merge pull request #212 from KDK-Alli/piwik · e0a71453
  Demian Katz authored 10 years ago
```
Added support for Piwik analytics.
```
  e0a71453
- Refactored Piwik support for better readability and extensibility. Added a... · b2d0a174
  Ere Maijala authored 10 years ago
```
Refactored Piwik support for better readability and extensibility. Added a couple more custom variables (Sort, Page, Limit, View) to search tracking.
```
  b2d0a174
Oct 08, 2014
- Bootlint Strikes! Putting a .row around all columned/side-menu'd templates. · eca27fb7
  Chris Hallberg authored 10 years ago
  
  eca27fb7
- Improved cart login followup behavior. · 9c60f897
  Demian Katz authored 10 years ago
  
  9c60f897
- Moved more logic into followup helper. · eaf59dc2
  Demian Katz authored 10 years ago
```
- Better encapsulation, lighter controllers.
```
  eaf59dc2
- Merge branch 'release-2.3' · c5dd0325
  Chris Hallberg authored 10 years ago
  
  c5dd0325
- Bootprint style adjustments to fix visual anomolies caused bythe Typeahead update. · bc1054f1
  Chris Hallberg authored 10 years ago
  
  bc1054f1
- Merge branch 'release-2.3' · 0c903cc2
  Chris Hallberg authored 10 years ago
```
Conflicts:
	themes/bootstrap3/js/common.js
```
  0c903cc2
- Typeahead now updates with type and removes dependency on Bloodhound. Fixes VUFIND-1033. · 3fef3062
  Chris Hallberg authored 10 years ago
  
  3fef3062

Admin message