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

..

ACL.png

Documentation updates, permissions diagrams and inkscape sources

2012-02-05 02:47:11 -04:00

customization.rst

Add section headers to the customization chapter

2012-02-27 11:07:19 -04:00

development.rst

Added another example to the debug section

2012-02-27 11:16:20 -04:00

document_visualization.rst

Documentation updates

2012-02-12 17:12:42 -04:00

documentation.rst

Split documentation and translation chapter from the development chapter of the documentation

2012-02-26 16:58:49 -04:00

file_storage.rst

Documentation updates, permissions diagrams and inkscape sources

2012-02-05 02:47:11 -04:00

index_instance.png

Finished indexes topic of the documentation will full ilustrations

2012-02-07 01:46:20 -04:00

index_template.png

Finished indexes topic of the documentation will full ilustrations

2012-02-07 01:46:20 -04:00

index.rst

Split documentation and translation chapter from the development chapter of the documentation

2012-02-26 16:58:49 -04:00

indexes.png

Finished indexes topic of the documentation will full ilustrations

2012-02-07 01:46:20 -04:00

indexes.rst

Documentation updates, split indexes and permissions into sections

2012-02-11 21:21:16 -04:00

initial_import.rst

Moved bulk document and user import to a separate chapter

2012-02-18 04:12:59 -04:00

mayan-login.png

Add customization documentation page

2012-02-26 16:49:46 -04:00

no-icons.png

Add customization documentation page

2012-02-26 16:49:46 -04:00

ocr.rst

Documentation updates, allow settings reference linking from other documents

2012-02-01 17:04:54 -04:00

permissions.png

Documentation updates, permissions diagrams and inkscape sources

2012-02-05 02:47:11 -04:00

permissions.rst

Documentation updates, split indexes and permissions into sections

2012-02-11 21:21:16 -04:00

settings.rst

Merge branch 'hotfix/v0.12.1' into development

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

signatures.rst

Add document signatures chapter

2012-02-18 04:13:32 -04:00

smart_links.rst

Documentation updates

2012-02-12 17:12:42 -04:00

technical.rst

Documentation updates

2012-02-01 13:43:24 -04:00

themes.png

Add customization documentation page

2012-02-26 16:49:46 -04:00

transformations.rst

Documentation updates

2012-02-01 13:43:24 -04:00

translations.rst

Fix typo

2012-02-26 17:00:51 -04:00

versioning.png

Add versioning chapter and diagram

2012-02-18 04:12:38 -04:00

versioning.rst

Add versioning chapter and diagram

2012-02-18 04:12:38 -04:00