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

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00

lang

Added Russian locale post OCR cleanup backend (Сергей Глита [Sergei Glita])

2011-11-06 01:21:19 -04:00

locale

Update translation files

2012-06-17 19:14:23 -04:00

parsers

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00

static/images/icons

Moved OCR links to the tools main menu

2011-08-18 19:45:48 -04:00

__init__.py

Move ocr app links to a seprate file

2012-06-08 18:28:04 -04:00

admin.py

PEP8, pylint cleanups and removal of relative imports

2011-04-23 02:49:07 -04:00

api.py

Fix 'get_image_cache_name() takes exactly 3 arguments (2 given)' (Barry Rowlingson, SaintGermain)

2012-02-09 02:24:18 -04:00

exceptions.py

PEP8 cleanups, remove OCR_CACHE_URI

2012-01-18 13:53:02 -04:00

forms.py

Code cleanup

2011-07-21 11:46:15 -04:00

links.py

Move ocr app links to a seprate file

2012-06-08 18:28:04 -04:00

literals.py

Added PDF file support to the python converter backend via ghostscript

2011-07-19 20:55:08 -04:00

managers.py

Codying style update, added comments

2012-01-03 04:37:03 -04:00

models.py

Add missing import

2012-05-30 19:35:17 -04:00

permissions.py

Codying style update, added comments

2012-01-03 04:37:03 -04:00

statistics.py

PEP8, pylint cleanups and removal of relative imports

2011-04-23 02:49:07 -04:00

tasks.py

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00

urls.py

Remove deprecated OCR task view

2012-01-27 16:33:29 -04:00

views.py

Clean up (unused imports, PEP8, etc)

2012-06-08 16:43:54 -04:00