Roberto Rosario c24a3f935e Merge branch 'hotfix/v0.12.1' into development ...

Conflicts:
	apps/converter/conf/settings.py
	apps/documents/__init__.py
	apps/main/__init__.py
	apps/metadata/__init__.py
	apps/navigation/templatetags/navigation_tags.py
	apps/ocr/__init__.py
	apps/ocr/conf/settings.py
	docs/intro/installation.rst
	docs/releases/index.rst
	requirements/production.txt

2012-06-03 22:50:33 -04:00

..

locale

Update compiled translation fixes for Italian

2012-05-30 18:37:43 -04:00

templates

Update template to use new variable name

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

templatetags

Merge branch 'hotfix/v0.12.1' into development

2012-06-03 22:50:33 -04:00

__init__.py

PEP8 cleanups

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

api.py

Properly initialize ResolvedLink class

2012-03-29 23:43:51 -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