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

__init__.py

Start top menu refactor, added elementtree to requirements

2012-03-16 21:07:53 -04:00

api.py

Converted project_setup and project_tools apps to use new elementtree based menus

2012-03-16 21:42:03 -04:00

models.py

Improved tools menu using horizontal button widget just like the project_setup app

2011-08-18 11:24:25 -04:00

urls.py

Improved tools menu using horizontal button widget just like the project_setup app

2011-08-18 11:24:25 -04:00

views.py

Remove empty items from project_setup and project_tools list of objects

2012-03-29 23:45:24 -04:00