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

..

acls

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

checkouts

Remove comments

2012-06-28 15:57:29 -04:00

common

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

converter

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

django_gpg

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

document_acls

Move acls apps links to a separate file

2012-06-08 17:33:57 -04:00

document_comments

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

document_indexing

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

document_signatures

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

documents

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

dynamic_search

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

folders

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

history

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

installation

Move uuid setting from __init__ to model

2012-06-29 03:46:43 -04:00

job_processor

Remove unused test files

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

linking

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

lock_manager

Add transaction rollback

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

mailer

Move mailer app links to a separate file

2012-06-08 18:51:49 -04:00

main

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

metadata

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

mimetype

Clean up (unused imports, PEP8, etc)

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

navigation

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

ocr

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

permissions

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

project_setup

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

project_tools

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

rest_api

Remove unused test files

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

scheduler

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -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.2' into development

2012-06-30 04:00:01 -04:00

sources

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -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.2' into development

2012-06-30 04:00:01 -04:00

user_management

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

web_theme

Merge branch 'hotfix/v0.12.2' into development

2012-06-30 04:00:01 -04:00

workflows

Remove the workflow state permissions

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