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

middleware

Updated permission denied middleware to comform to coding style

2011-05-08 01:58:33 -04:00

migrations

Add migrations to convert existing databases to the class based permission system

2011-12-19 17:06:41 -04:00

static/images/icons

Added new app 'project_setup' to display a setup dashboard style view instead of a secondary action list

2011-08-18 02:37:32 -04:00

templatetags

Fix import format

2012-01-08 04:57:02 -04:00

__init__.py

Fix Permission class import statement

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

admin.py

Cleanups, permissions separation into explicit module, absolute import update

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

api.py

PEP8 cleanups

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

exceptions.py

Initial commit adding document checkout support

2012-06-11 01:25:02 -04:00

forms.py

Cleanups, permissions separation into explicit module, absolute import update

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

links.py

Move permissions app links to a separate file

2012-06-08 18:44:25 -04:00

managers.py

Add anonymous user support to the permission app

2012-01-08 04:57:54 -04:00

models.py

Don't return references to deleted users as a members

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

permissions.py

Cleanups, permissions separation into explicit module, absolute import update

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

runtime.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

Remove delete mode in the permission grant and remove views (Sergei Glita)

2012-02-07 10:42:07 -04:00

widgets.py

Updated all apps and widgets with explicit safely marked strings

2011-07-01 20:53:37 -04:00