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

Convert all apps to use the new class based settings

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

locale

Update translation files

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

static/images/icons

Added new app 'project_setup' to display a setup dashboard style view instead of a secondary action list

2011-08-18 02:37:32 -04:00

templates

Added side bar help to convert's file format list, recent document, document type and metadata set and type views

2011-06-19 20:16:46 -04:00

__init__.py

Move metadata app links to a seprate file

2012-06-08 18:24:30 -04:00

admin.py

PEP8 cleanups

2012-01-18 14:37:15 -04:00

api.py

Add the options --metadata and --document_type to the bulk uploader

2012-01-26 11:14:22 -04:00

classes.py

Add option group support to the document type default metadata types and sets view

2012-02-02 15:37:36 -04:00

forms.py

PEP8 cleanups

2012-01-18 14:37:15 -04:00

links.py

Move metadata app links to a seprate file

2012-06-08 18:24:30 -04:00

models.py

Remove document metadata value helper, update document index template accordingly

2012-05-21 10:28:46 -04:00

permissions.py

PEP8 cleanups

2012-01-18 14:37:15 -04:00

urls.py

Rename metadata set edit as metadata set members, add proper metadata set edit view

2012-05-24 02:59:30 -04:00

views.py

Rename metadata set edit as metadata set members, add proper metadata set edit view

2012-05-24 02:59:30 -04:00