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

static/images/icons

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

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

__init__.py

Converted project_setup and project_tools apps to use new elementtree based menus

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

api.py

Add transaction rollback

2012-02-06 14:38:59 -04:00

forms.py

Cleanups, permissions separation into explicit module, absolute import update

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

managers.py

Initial commit of the generic history app

2011-05-26 05:07:26 -04:00

models.py

Cleanups, permissions separation into explicit module, absolute import update

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

permissions.py

Add ACL support to the history app

2012-01-03 03:28:17 -04:00

runtime_data.py

Initial commit of the generic history app

2011-05-26 05:07:26 -04:00

urls.py

PEP8 cleanups, unused imports and bumped version to 0.7.3

2011-06-08 01:39:38 -04:00

views.py

Add ACL support to the history app

2012-01-03 03:28:17 -04:00

widgets.py

Updated all apps and widgets with explicit safely marked strings

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