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

..

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

templates

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

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

templatetags

Added new 'add document to folder' link to replace the sidebar template with the same use, added document membership list view, improved other folders apps views

2011-07-04 04:02:52 -04:00

__init__.py

Move folder app links to a separate file

2012-06-08 18:15:15 -04:00

admin.py

Cleanups, permissions separation into explicit module, absolute import update

2012-01-02 03:48:26 -04:00

forms.py

PEP8 cleanups

2012-01-18 14:37:15 -04:00

links.py

Move folder app links to a separate file

2012-06-08 18:15:15 -04:00

models.py

Return a QuerySet of documents instead

2012-02-02 00:38:58 -04:00

permissions.py

PEP8 cleanups

2012-01-18 14:37:15 -04:00

urls.py

PEP8 cleanups

2012-01-18 14:37:15 -04:00

views.py

Fix Permission class import statement

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