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

static/images/icons

Add acl app static media directory

2011-12-14 09:11:43 -04:00

templatetags

PEP8 cleanups

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

__init__.py

Move acls apps links to a separate file

2012-06-08 17:33:57 -04:00

admin.py

PEP8 cleanups

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

api.py

Make api module not dependant on any other

2012-01-09 04:47:41 -04:00

classes.py

Move EncapsulatedObject class to common app

2012-05-24 02:41:45 -04:00

forms.py

acl app cleanups

2012-02-22 14:34:05 -04:00

links.py

Move acls apps links to a separate file

2012-06-08 17:33:57 -04:00

literals.py

Add creator content type icon

2012-01-21 04:04:13 -04:00

managers.py

Fix ACL calculation when user doesn't belong to any group or role

2012-06-17 00:35:27 -04:00

models.py

acl app cleanups

2012-02-22 14:34:05 -04:00

permissions.py

Cleanups, permissions separation into explicit module, absolute import update

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

urls.py

PEP8 cleanups

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

utils.py

Move EncapsulatedObject class to common app

2012-05-24 02:41:45 -04:00

views.py

acl app cleanups

2012-02-22 14:34:05 -04:00

widgets.py

Remove unused import

2012-01-18 16:05:11 -04:00