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

Convert all apps to use the new class based settings

2012-03-06 16:08:28 -04:00

locale

Update translation files

2012-06-17 19:14:23 -04:00

migrations

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00

static/images/icons

Add new indexing static media

2012-02-01 01:27:04 -04:00

templates

Added help side bar templates to the document indexing and folders apps

2011-06-19 20:43:46 -04:00

__init__.py

Move document_indexing app links to a seprate file

2012-06-08 17:41:14 -04:00

admin.py

Small updates and fixes

2012-02-02 09:33:28 -04:00

api.py

Correctly match a new node instance to it's respective parent

2012-02-23 13:53:50 -04:00

exceptions.py

Move exception to a single module

2012-02-02 09:23:20 -04:00

filesystem.py

Add sanity check when assembling a full path

2012-02-22 15:01:54 -04:00

forms.py

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00

links.py

Move document_indexing app links to a seprate file

2012-06-08 17:41:14 -04:00

models.py

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00

permissions.py

Add index setup views and related permissions, urls and links

2012-02-01 01:25:22 -04:00

tools.py

PEP8 and general cleanups

2012-02-22 11:57:00 -04:00

urls.py

Small updates and fixes

2012-02-02 09:33:28 -04:00

utils.py

Added remaining functionality to document indexing (filesystem rebuild, better warning reporting)

2011-05-20 00:34:31 -04:00

views.py

Don't create the index's root node on the view, call the root node created when the index is created

2012-02-23 13:52:42 -04:00

widgets.py

PEP8 and general cleanups

2012-02-22 11:57:00 -04:00