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

..

acls

Merge branch 'hotfix/v0.12.1' into development

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

common

Merge branch 'hotfix/v0.12.1' into development

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

converter

Merge branch 'hotfix/v0.12.1' into development

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

django_gpg

Merge branch 'hotfix/v0.12.1' into development

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

document_acls

Remove unnecesary extra_context from document_acl view

2012-03-18 03:33:15 -04:00

document_comments

Merge branch 'hotfix/v0.12.1' into development

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

document_indexing

Merge branch 'hotfix/v0.12.1' into development

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

document_signatures

Merge branch 'hotfix/v0.12.1' into development

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

documents

Merge branch 'hotfix/v0.12.1' into development

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

dynamic_search

Merge branch 'hotfix/v0.12.1' into development

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

feedback

Convert feedback app to use new class based links

2012-03-18 00:42:48 -04:00

folders

Merge branch 'hotfix/v0.12.1' into development

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

history

Merge branch 'hotfix/v0.12.1' into development

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

job_processor

Remove unused test files

2012-02-22 11:55:48 -04:00

linking

Merge branch 'hotfix/v0.12.1' into development

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

lock_manager

Add transaction rollback

2012-02-06 14:56:27 -04:00

mailer

Convert all remaining apps to the new class based links

2012-03-16 20:09:35 -04:00

main

Bump version to v0.12.1

2012-05-29 02:37:19 -04:00

metadata

Merge branch 'hotfix/v0.12.1' into development

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

mimetype

Allow document mimetypes to be None

2012-05-29 23:54:07 -04:00

navigation

Merge branch 'hotfix/v0.12.1' into development

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

ocr

Merge branch 'hotfix/v0.12.1' into development

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

permissions

Merge branch 'hotfix/v0.12.1' into development

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

project_setup

Merge branch 'hotfix/v0.12.1' into development

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

project_tools

Merge branch 'hotfix/v0.12.1' into development

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

rest_api

Remove unused test files

2012-02-22 11:55:48 -04:00

scheduler

Remove unused test files

2012-02-22 11:55:48 -04:00

signaler

Improve handling of the inserted --mayan_runtime update_index flags

2012-05-22 23:24:17 -04:00

smart_settings

Merge branch 'hotfix/v0.12.1' into development

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

sources

Merge branch 'hotfix/v0.12.1' into development

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

storage

Convert all apps to use the new class based settings

2012-03-06 16:08:28 -04:00

tags

Merge branch 'hotfix/v0.12.1' into development

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

user_management

Converted project_setup and project_tools apps to use new elementtree based menus

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

web_theme

Merge branch 'hotfix/v0.12.1' into development

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

workflows

Remove the workflow state permissions

2012-05-23 01:21:41 -04:00