From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Fri, 10 Jun 2011 18:25:26 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~5
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/3f0672f752c59dbcba206fee9f42dd145182817c?ds=sidebyside

Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Removed results action from SearchAdmin. Added support for vanilla django result viewing.
  Refactored BaseSearch/Result to use templates to render the title and content entries in the Result's context. Removed rendered results from the ajax API. Added favored result support to _list for ajax and non-ajax versions.
  Clarified sobol Search framework - now automatically finds result templates at "sobol/search/<slug>/result.html" and supports the notion of link 'content'. Search.get_result_url and Search.more_results_url actually return urls. Improved grappelli admin integration for Search model instances.
  Added docs for result list template. Moved success/error handling into hooks on sobol. Added slug to JSON response dict. Added script suppression option to _list.html.
  Removed json version of results from the ajax API. Improved checks for search existence. Added default search list template and a static js file for the ajax api.
  Added a 'how are we different' section to the 'what is philo' page.
  Adjusted sobol cache usage to make an entry for every string/search combination or not use the cache at all. This is a more correct way of handling things, and anyone worried about too many cache entries from sobol can just increase the size of their cache. Also, sobol now caches search instances rather than just results - searches like GoogleSearch can now persist non-result state acquired with the results.
---

3f0672f752c59dbcba206fee9f42dd145182817c