Roberto Rosario c24a3f935e Merge branch 'hotfix/v0.12.1' into development ...

Conflicts:
	apps/converter/conf/settings.py
	apps/documents/__init__.py
	apps/main/__init__.py
	apps/metadata/__init__.py
	apps/navigation/templatetags/navigation_tags.py
	apps/ocr/__init__.py
	apps/ocr/conf/settings.py
	docs/intro/installation.rst
	docs/releases/index.rst
	requirements/production.txt

2012-06-03 22:50:33 -04:00

..

conf

Initial commit of the index update scheduling support

2012-04-13 01:32:54 -04:00

locale

Update compiled translation fixes for Italian

2012-05-30 18:37:43 -04:00

migrations

Add migration for the dynamic_search app

2012-05-22 15:20:01 -04:00

templates

Remove flat comment document helper, update document indexing template accordingly

2012-05-21 10:42:17 -04:00

templatetags

Remove remaining code for the old search method and the advanced search support, misc cleanups too

2012-04-12 12:59:06 -04:00

__init__.py

Disable advanced search menu entry

2012-05-23 01:19:45 -04:00

admin.py

Improve IndexableObject class methods

2012-04-12 02:04:50 -04:00

managers.py

Move removal of items marked for indexing to the search_indexes.py file

2012-05-22 23:25:06 -04:00

models.py

Remove remaining code for the old search method and the advanced search support, misc cleanups too

2012-04-12 12:59:06 -04:00

search_indexes.py

Move removal of items marked for indexing to the search_indexes.py file

2012-05-22 23:25:06 -04:00

urls.py

Remove remaining code for the old search method and the advanced search support, misc cleanups too

2012-04-12 12:59:06 -04:00

views.py

Apply permission and ACL checks to the search results

2012-04-15 22:47:49 -04:00