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

__init__.py

Move document_comments app links to a separate file

2012-06-08 23:07:33 -04:00

forms.py

Finished renaming comments app to document_comments

2011-05-01 16:13:34 -04:00

links.py

Move document_comments app links to a separate file

2012-06-08 23:07:33 -04:00

models.py

Finished renaming comments app to document_comments

2011-05-01 16:13:34 -04:00

permissions.py

Remove the unimplemented PERMISSION_COMMENT_EDIT permission

2012-01-03 18:48:12 -04:00

urls.py

Add ACL support to the document comments app

2012-01-03 18:49:03 -04:00

views.py

Clean up (unused imports, PEP8, etc)

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