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

Clean up (unused imports, PEP8, etc)

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

locale

Update translation files

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

migrations

Allow document mimetypes to be None

2012-05-29 23:54:07 -04:00

static/images/icons

Add document version revert support

2011-12-04 01:11:12 -04:00

templates

Haystack updates

2012-04-09 07:41:03 -04:00

templatetags

Fix document print view

2011-12-04 02:37:11 -04:00

__init__.py

Merge branch 'hotfix/v0.12.2' into development

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

admin.py

PEP8 cleanups

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

events.py

Move documents apps history events to a separate file

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

exceptions.py

Add NewDocumentVersionNotAllowed exception to documents app

2012-06-15 19:28:22 -04:00

forms.py

Merge branch 'hotfix/v0.12.2' into development

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

links.py

Clean up (unused imports, PEP8, etc)

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

literals.py

Add support to specifying the compressed documents download filename

2012-06-28 16:13:26 -04:00

managers.py

Move the RecentDocumentManager to the models.py file

2012-02-05 23:27:03 -04:00

models.py

Merge branch 'hotfix/v0.12.2' into development

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

permissions.py

Move the 'PERMISSION_DOCUMENT_NEW_VERSION' permission from the sources to the documents app

2012-01-03 04:26:31 -04:00

statistics.py

Catch OSError exception when calculating document filesystem stats

2012-05-29 02:46:30 -04:00

tests.py

PEP8 cleanups, style cleanups, unused imports

2012-01-18 13:52:19 -04:00

urls.py

PEP8 cleanups, style cleanups, unused imports

2012-01-18 13:52:19 -04:00

utils.py

Clean up (unused imports, PEP8, etc)

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

views.py

Merge branch 'hotfix/v0.12.2' into development

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

widgets.py

Add support to document widget to display a title

2012-03-14 15:25:35 -04:00

wizards.py

Call Django's urlencode directly to ensure unicode data preservation

2012-03-04 20:30:40 -04:00