Roberto Rosario 080d68c169 Merge branch 'hotfix/v0.12.2' into development ...

Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py

2012-06-30 04:00:01 -04:00

..

conf

Initial commit of the index update scheduling support

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

locale

Update translation files

2012-06-17 19:14:23 -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

Fix Permission class import statement

2012-06-08 18:52:19 -04:00