adapt ranked relevance to new query syntax, adjust offset of the scroll to highlight function to make it more readable
Merge pull request #91 from rwhaling/master

cooccurrence search bug fix, experimental
Merge pull request #92 from clovis/master

Update upstream
Merge pull request #14 from ARTFL-Project/master

Update downstream
Merge pull request #93 from rwhaling/master

bufferedParser, etc.
Merge pull request #15 from ARTFL-Project/master

Update downstream
Loader rewrite
Merge pull request #94 from clovis/master

update upstream
fixes in javascript due to pushstate, initial support of query syntax in highlighter
Merge pull request #95 from clovis/master

Update upstream
fix bugs related to pushState
use localStorage to store collocation results in order to avoid a full reload
split javascript function into separate files, plus minor fixes
more splitting up of javascript functions
Merge pull request #96 from clovis/master

Use sessionStorage for collocations, modularize javascript code
fixes to autocomplete
Merge pull request #97 from clovis/master

fixes to autocomplete
Merge pull request #98 from rwhaling/master

bug fix in Query.py
Merge pull request #16 from ARTFL-Project/master

Update downstream
Merge pull request #99 from rwhaling/master

experimental patch to query.py for better term length parsing