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

templates

Update template to use new variable name

2012-03-18 03:35:25 -04:00

templatetags

Rename variable for readability

2012-06-08 17:17:24 -04:00

__init__.py

PEP8 cleanups

2012-03-18 04:02:03 -04:00

api.py

Rename variable for readability

2012-06-08 17:17:24 -04:00

forms.py

PEP8 and Pylint cleanups

2011-04-07 17:21:15 -04:00

models.py

Moved navigation code to its own app

2011-03-22 00:54:43 -04:00

utils.py

Disable debug statement causing unicode errors

2012-05-23 01:35:17 -04:00

views.py

Moved navigation code to its own app

2011-03-22 00:54:43 -04:00

widgets.py

Only try to render resolved links

2012-03-29 23:44:21 -04:00