Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'v1'

Conflicts:
	HISTORY
	README.textile
	lib/thinking_sphinx/version.rb
  • Loading branch information...
commit dee44333c83ecc5777ce86cd9f9f3a7e78e59799 2 parents aeaf7b4 + abf69fc
@pat authored
Showing with 10 additions and 4 deletions.
  1. +9 −4 HISTORY
  2. +1 −0  README.textile
View
13 HISTORY
@@ -1,9 +1,5 @@
Edge:
* Use BasicObject instead of BlankSlate when running on 1.9 (Steve Purcell).
-* Use full query in excerpts so double-stemming of terms is avoided (Jason Rust).
-* Fix thinking_sphinx:version rake task.
-* Directly compare non-string non-nil facet values for facet filters.
-* Don't bother checking with Sphinx whether documents exist when trying to update them. We're catching failures already (and Sphinx usually doesn't care anyway).
2.0.13 - August 10th 2012
* 1.4.13 changes.
@@ -71,6 +67,15 @@ Edge:
* Rails 3 support.
* 1.4.0 changes.
+1.4.14 - January 2nd 2013
+* Allow sql_query_pre values to come through from config/sphinx.yml (George Ogata).
+* ThinkingSphinx::Search#tap doesn't delegate through to the underlying array.
+* Use fire_delta? instance method in the model (if it exists) to decide whether indexing should happen.
+* Use full query in excerpts so double-stemming of terms is avoided (Jason Rust).
+* Fix thinking_sphinx:version rake task.
+* Directly compare non-string non-nil facet values for facet filters.
+* Don't bother checking with Sphinx whether documents exist when trying to update them. We're catching failures already (and Sphinx usually doesn't care anyway).
+
1.4.13 - August 10th 2012
* Sphinx 2.0.5 support.
* Hard retries for Sphinx exceptions (Andrew Hunter).
View
1  README.textile
@@ -233,3 +233,4 @@ Since I first released this library, there's been quite a few people who have su
* Nathan Smith
* Cedric Maion
* Steve Purcell
+* George Ogata
Please sign in to comment.
Something went wrong with that request. Please try again.