Merge branch 'hotfix/v0.12.3' into hotfix_0.12.3_merge

Conflicts: apps/acls/locale/de_DE/LC_MESSAGES/django.mo apps/acls/locale/en/LC_MESSAGES/django.po apps/acls/locale/es/LC_MESSAGES/django.mo apps/acls/locale/es/LC_MESSAGES/django.po apps/acls/locale/it/LC_MESSAGES/django.mo apps/acls/locale/pl/LC_MESSAGES/django.mo apps/acls/locale/pt/LC_MESSAGES/django.mo apps/acls/locale/pt/LC_MESSAGES/django.po apps/acls/locale/pt_BR/LC_MESSAGES/django.mo apps/acls/locale/pt_BR/LC_MESSAGES/django.po apps/acls/locale/ru/LC_MESSAGES/django.mo apps/common/locale/de_DE/LC_MESSAGES/django.mo apps/common/locale/de_DE/LC_MESSAGES/django.po apps/common/locale/en/LC_MESSAGES/django.po apps/common/locale/es/LC_MESSAGES/django.mo apps/common/locale/es/LC_MESSAGES/django.po apps/common/locale/it/LC_MESSAGES/django.mo apps/common/locale/it/LC_MESSAGES/django.po apps/common/locale/pl/LC_MESSAGES/django.mo apps/common/locale/pl/LC_MESSAGES/django.po apps/common/locale/pt/LC_MESSAGES/django.mo apps/common/locale/pt/LC_MESSAGES/django.po apps/common/locale/pt_BR/LC_MESSAGES/django.mo apps/common/locale/pt_BR/LC_MESSAGES/django.po apps/common/locale/ru/LC_MESSAGES/django.mo apps/common/locale/ru/LC_MESSAGES/django.po apps/converter/conf/settings.py apps/converter/locale/de_DE/LC_MESSAGES/django.mo apps/converter/locale/de_DE/LC_MESSAGES/django.po apps/converter/locale/en/LC_MESSAGES/django.po apps/converter/locale/es/LC_MESSAGES/django.mo apps/converter/locale/es/LC_MESSAGES/django.po apps/converter/locale/it/LC_MESSAGES/django.mo apps/converter/locale/it/LC_MESSAGES/django.po apps/converter/locale/pl/LC_MESSAGES/django.mo apps/converter/locale/pl/LC_MESSAGES/django.po apps/converter/locale/pt/LC_MESSAGES/django.mo apps/converter/locale/pt/LC_MESSAGES/django.po apps/converter/locale/pt_BR/LC_MESSAGES/django.mo apps/converter/locale/pt_BR/LC_MESSAGES/django.po apps/converter/locale/ru/LC_MESSAGES/django.mo apps/converter/locale/ru/LC_MESSAGES/django.po apps/django_gpg/locale/de_DE/LC_MESSAGES/django.mo apps/django_gpg/locale/en/LC_MESSAGES/django.po apps/django_gpg/locale/es/LC_MESSAGES/django.mo apps/django_gpg/locale/es/LC_MESSAGES/django.po apps/django_gpg/locale/it/LC_MESSAGES/django.mo apps/django_gpg/locale/pl/LC_MESSAGES/django.mo apps/django_gpg/locale/pt/LC_MESSAGES/django.mo apps/django_gpg/locale/pt/LC_MESSAGES/django.po apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.mo apps/django_gpg/locale/pt_BR/LC_MESSAGES/django.po apps/django_gpg/locale/ru/LC_MESSAGES/django.mo apps/document_comments/locale/de_DE/LC_MESSAGES/django.mo apps/document_comments/locale/en/LC_MESSAGES/django.po apps/document_comments/locale/es/LC_MESSAGES/django.mo apps/document_comments/locale/es/LC_MESSAGES/django.po apps/document_comments/locale/it/LC_MESSAGES/django.mo apps/document_comments/locale/pl/LC_MESSAGES/django.mo apps/document_comments/locale/pt/LC_MESSAGES/django.mo apps/document_comments/locale/pt/LC_MESSAGES/django.po apps/document_comments/locale/pt_BR/LC_MESSAGES/django.mo apps/document_comments/locale/pt_BR/LC_MESSAGES/django.po apps/document_comments/locale/ru/LC_MESSAGES/django.mo apps/document_indexing/__init__.py apps/document_indexing/locale/de_DE/LC_MESSAGES/django.mo apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po apps/document_indexing/locale/en/LC_MESSAGES/django.po apps/document_indexing/locale/es/LC_MESSAGES/django.mo apps/document_indexing/locale/es/LC_MESSAGES/django.po apps/document_indexing/locale/it/LC_MESSAGES/django.mo apps/document_indexing/locale/it/LC_MESSAGES/django.po apps/document_indexing/locale/pl/LC_MESSAGES/django.mo apps/document_indexing/locale/pl/LC_MESSAGES/django.po apps/document_indexing/locale/pt/LC_MESSAGES/django.mo apps/document_indexing/locale/pt/LC_MESSAGES/django.po apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.mo apps/document_indexing/locale/pt_BR/LC_MESSAGES/django.po apps/document_indexing/locale/ru/LC_MESSAGES/django.mo apps/document_indexing/locale/ru/LC_MESSAGES/django.po apps/document_signatures/locale/de_DE/LC_MESSAGES/django.mo apps/document_signatures/locale/en/LC_MESSAGES/django.po apps/document_signatures/locale/es/LC_MESSAGES/django.mo apps/document_signatures/locale/es/LC_MESSAGES/django.po apps/document_signatures/locale/it/LC_MESSAGES/django.mo apps/document_signatures/locale/pl/LC_MESSAGES/django.mo apps/document_signatures/locale/pt/LC_MESSAGES/django.mo apps/document_signatures/locale/pt/LC_MESSAGES/django.po apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.mo apps/document_signatures/locale/pt_BR/LC_MESSAGES/django.po apps/document_signatures/locale/ru/LC_MESSAGES/django.mo apps/documents/__init__.py apps/documents/forms.py apps/documents/locale/de_DE/LC_MESSAGES/django.mo apps/documents/locale/de_DE/LC_MESSAGES/django.po apps/documents/locale/es/LC_MESSAGES/django.mo apps/documents/locale/es/LC_MESSAGES/django.po apps/documents/locale/it/LC_MESSAGES/django.mo apps/documents/locale/it/LC_MESSAGES/django.po apps/documents/locale/pl/LC_MESSAGES/django.mo apps/documents/locale/pl/LC_MESSAGES/django.po apps/documents/locale/pt/LC_MESSAGES/django.mo apps/documents/locale/pt/LC_MESSAGES/django.po apps/documents/locale/pt_BR/LC_MESSAGES/django.mo apps/documents/locale/pt_BR/LC_MESSAGES/django.po apps/documents/locale/ru/LC_MESSAGES/django.mo apps/documents/locale/ru/LC_MESSAGES/django.po apps/documents/views.py apps/dynamic_search/locale/de_DE/LC_MESSAGES/django.mo apps/dynamic_search/locale/en/LC_MESSAGES/django.po apps/dynamic_search/locale/es/LC_MESSAGES/django.mo apps/dynamic_search/locale/es/LC_MESSAGES/django.po apps/dynamic_search/locale/it/LC_MESSAGES/django.mo apps/dynamic_search/locale/pl/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt/LC_MESSAGES/django.po apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.mo apps/dynamic_search/locale/pt_BR/LC_MESSAGES/django.po apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo apps/dynamic_search/models.py apps/folders/locale/de_DE/LC_MESSAGES/django.mo apps/folders/locale/de_DE/LC_MESSAGES/django.po apps/folders/locale/en/LC_MESSAGES/django.po apps/folders/locale/es/LC_MESSAGES/django.mo apps/folders/locale/es/LC_MESSAGES/django.po apps/folders/locale/it/LC_MESSAGES/django.mo apps/folders/locale/pl/LC_MESSAGES/django.mo apps/folders/locale/pt/LC_MESSAGES/django.mo apps/folders/locale/pt/LC_MESSAGES/django.po apps/folders/locale/pt_BR/LC_MESSAGES/django.mo apps/folders/locale/pt_BR/LC_MESSAGES/django.po apps/folders/locale/ru/LC_MESSAGES/django.mo apps/history/locale/de_DE/LC_MESSAGES/django.mo apps/history/locale/en/LC_MESSAGES/django.po apps/history/locale/es/LC_MESSAGES/django.mo apps/history/locale/es/LC_MESSAGES/django.po apps/history/locale/it/LC_MESSAGES/django.mo apps/history/locale/pl/LC_MESSAGES/django.mo apps/history/locale/pt/LC_MESSAGES/django.mo apps/history/locale/pt/LC_MESSAGES/django.po apps/history/locale/pt_BR/LC_MESSAGES/django.mo apps/history/locale/pt_BR/LC_MESSAGES/django.po apps/history/locale/ru/LC_MESSAGES/django.mo apps/installation/locale/de_DE/LC_MESSAGES/django.mo apps/installation/locale/en/LC_MESSAGES/django.po apps/installation/locale/es/LC_MESSAGES/django.mo apps/installation/locale/es/LC_MESSAGES/django.po apps/installation/locale/it/LC_MESSAGES/django.mo apps/installation/locale/pl/LC_MESSAGES/django.mo apps/installation/locale/pt/LC_MESSAGES/django.mo apps/installation/locale/pt_BR/LC_MESSAGES/django.mo apps/installation/locale/pt_BR/LC_MESSAGES/django.po apps/installation/locale/ru/LC_MESSAGES/django.mo apps/linking/locale/de_DE/LC_MESSAGES/django.mo apps/linking/locale/en/LC_MESSAGES/django.po apps/linking/locale/es/LC_MESSAGES/django.mo apps/linking/locale/es/LC_MESSAGES/django.po apps/linking/locale/it/LC_MESSAGES/django.mo apps/linking/locale/pl/LC_MESSAGES/django.mo apps/linking/locale/pt/LC_MESSAGES/django.mo apps/linking/locale/pt/LC_MESSAGES/django.po apps/linking/locale/pt_BR/LC_MESSAGES/django.mo apps/linking/locale/pt_BR/LC_MESSAGES/django.po apps/linking/locale/ru/LC_MESSAGES/django.mo apps/main/locale/de_DE/LC_MESSAGES/django.mo apps/main/locale/de_DE/LC_MESSAGES/django.po apps/main/locale/en/LC_MESSAGES/django.po apps/main/locale/es/LC_MESSAGES/django.mo apps/main/locale/es/LC_MESSAGES/django.po apps/main/locale/it/LC_MESSAGES/django.mo apps/main/locale/it/LC_MESSAGES/django.po apps/main/locale/pl/LC_MESSAGES/django.mo apps/main/locale/pl/LC_MESSAGES/django.po apps/main/locale/pt/LC_MESSAGES/django.mo apps/main/locale/pt_BR/LC_MESSAGES/django.mo apps/main/locale/pt_BR/LC_MESSAGES/django.po apps/main/locale/ru/LC_MESSAGES/django.mo apps/main/locale/ru/LC_MESSAGES/django.po apps/metadata/__init__.py apps/metadata/locale/de_DE/LC_MESSAGES/django.mo apps/metadata/locale/en/LC_MESSAGES/django.po apps/metadata/locale/es/LC_MESSAGES/django.mo apps/metadata/locale/es/LC_MESSAGES/django.po apps/metadata/locale/it/LC_MESSAGES/django.mo apps/metadata/locale/pl/LC_MESSAGES/django.mo apps/metadata/locale/pt/LC_MESSAGES/django.mo apps/metadata/locale/pt/LC_MESSAGES/django.po apps/metadata/locale/pt_BR/LC_MESSAGES/django.mo apps/metadata/locale/pt_BR/LC_MESSAGES/django.po apps/metadata/locale/ru/LC_MESSAGES/django.mo apps/navigation/locale/de_DE/LC_MESSAGES/django.mo apps/navigation/locale/en/LC_MESSAGES/django.po apps/navigation/locale/es/LC_MESSAGES/django.mo apps/navigation/locale/es/LC_MESSAGES/django.po apps/navigation/locale/it/LC_MESSAGES/django.mo apps/navigation/locale/pl/LC_MESSAGES/django.mo apps/navigation/locale/pt/LC_MESSAGES/django.mo apps/navigation/locale/pt/LC_MESSAGES/django.po apps/navigation/locale/pt_BR/LC_MESSAGES/django.mo apps/navigation/locale/pt_BR/LC_MESSAGES/django.po apps/navigation/locale/ru/LC_MESSAGES/django.mo apps/navigation/templatetags/navigation_tags.py apps/ocr/locale/de_DE/LC_MESSAGES/django.mo apps/ocr/locale/en/LC_MESSAGES/django.po apps/ocr/locale/es/LC_MESSAGES/django.mo apps/ocr/locale/es/LC_MESSAGES/django.po apps/ocr/locale/it/LC_MESSAGES/django.mo apps/ocr/locale/pl/LC_MESSAGES/django.mo apps/ocr/locale/pt/LC_MESSAGES/django.mo apps/ocr/locale/pt/LC_MESSAGES/django.po apps/ocr/locale/pt_BR/LC_MESSAGES/django.mo apps/ocr/locale/pt_BR/LC_MESSAGES/django.po apps/ocr/locale/ru/LC_MESSAGES/django.mo apps/permissions/locale/de_DE/LC_MESSAGES/django.mo apps/permissions/locale/de_DE/LC_MESSAGES/django.po apps/permissions/locale/en/LC_MESSAGES/django.po apps/permissions/locale/es/LC_MESSAGES/django.mo apps/permissions/locale/es/LC_MESSAGES/django.po apps/permissions/locale/it/LC_MESSAGES/django.mo apps/permissions/locale/it/LC_MESSAGES/django.po apps/permissions/locale/pl/LC_MESSAGES/django.mo apps/permissions/locale/pl/LC_MESSAGES/django.po apps/permissions/locale/pt/LC_MESSAGES/django.mo apps/permissions/locale/pt/LC_MESSAGES/django.po apps/permissions/locale/pt_BR/LC_MESSAGES/django.mo apps/permissions/locale/pt_BR/LC_MESSAGES/django.po apps/permissions/locale/ru/LC_MESSAGES/django.mo apps/permissions/locale/ru/LC_MESSAGES/django.po apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo apps/project_setup/locale/en/LC_MESSAGES/django.po apps/project_setup/locale/es/LC_MESSAGES/django.mo apps/project_setup/locale/es/LC_MESSAGES/django.po apps/project_setup/locale/it/LC_MESSAGES/django.mo apps/project_setup/locale/pl/LC_MESSAGES/django.mo apps/project_setup/locale/pt/LC_MESSAGES/django.mo apps/project_setup/locale/pt/LC_MESSAGES/django.po apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po apps/project_setup/locale/ru/LC_MESSAGES/django.mo apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo apps/project_tools/locale/en/LC_MESSAGES/django.po apps/project_tools/locale/es/LC_MESSAGES/django.mo apps/project_tools/locale/es/LC_MESSAGES/django.po apps/project_tools/locale/it/LC_MESSAGES/django.mo apps/project_tools/locale/pl/LC_MESSAGES/django.mo apps/project_tools/locale/pt/LC_MESSAGES/django.mo apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po apps/project_tools/locale/ru/LC_MESSAGES/django.mo apps/scheduler/locale/de_DE/LC_MESSAGES/django.mo apps/scheduler/locale/en/LC_MESSAGES/django.po apps/scheduler/locale/es/LC_MESSAGES/django.mo apps/scheduler/locale/es/LC_MESSAGES/django.po apps/scheduler/locale/it/LC_MESSAGES/django.mo apps/scheduler/locale/pl/LC_MESSAGES/django.mo apps/scheduler/locale/pt/LC_MESSAGES/django.mo apps/scheduler/locale/pt/LC_MESSAGES/django.po apps/scheduler/locale/pt_BR/LC_MESSAGES/django.mo apps/scheduler/locale/pt_BR/LC_MESSAGES/django.po apps/scheduler/locale/ru/LC_MESSAGES/django.mo apps/smart_settings/locale/de_DE/LC_MESSAGES/django.mo apps/smart_settings/locale/en/LC_MESSAGES/django.po apps/smart_settings/locale/es/LC_MESSAGES/django.mo apps/smart_settings/locale/es/LC_MESSAGES/django.po apps/smart_settings/locale/it/LC_MESSAGES/django.mo apps/smart_settings/locale/pl/LC_MESSAGES/django.mo apps/smart_settings/locale/pt/LC_MESSAGES/django.mo apps/smart_settings/locale/pt/LC_MESSAGES/django.po apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.mo apps/smart_settings/locale/pt_BR/LC_MESSAGES/django.po apps/smart_settings/locale/ru/LC_MESSAGES/django.mo apps/sources/__init__.py apps/sources/locale/de_DE/LC_MESSAGES/django.mo apps/sources/locale/de_DE/LC_MESSAGES/django.po apps/sources/locale/es/LC_MESSAGES/django.mo apps/sources/locale/es/LC_MESSAGES/django.po apps/sources/locale/it/LC_MESSAGES/django.mo apps/sources/locale/it/LC_MESSAGES/django.po apps/sources/locale/pl/LC_MESSAGES/django.mo apps/sources/locale/pl/LC_MESSAGES/django.po apps/sources/locale/pt/LC_MESSAGES/django.mo apps/sources/locale/pt/LC_MESSAGES/django.po apps/sources/locale/pt_BR/LC_MESSAGES/django.mo apps/sources/locale/pt_BR/LC_MESSAGES/django.po apps/sources/locale/ru/LC_MESSAGES/django.mo apps/sources/locale/ru/LC_MESSAGES/django.po apps/sources/views.py apps/tags/locale/de_DE/LC_MESSAGES/django.mo apps/tags/locale/en/LC_MESSAGES/django.po apps/tags/locale/es/LC_MESSAGES/django.mo apps/tags/locale/es/LC_MESSAGES/django.po apps/tags/locale/it/LC_MESSAGES/django.mo apps/tags/locale/pl/LC_MESSAGES/django.mo apps/tags/locale/pt/LC_MESSAGES/django.mo apps/tags/locale/pt/LC_MESSAGES/django.po apps/tags/locale/pt_BR/LC_MESSAGES/django.mo apps/tags/locale/pt_BR/LC_MESSAGES/django.po apps/tags/locale/ru/LC_MESSAGES/django.mo apps/user_management/locale/de_DE/LC_MESSAGES/django.mo apps/user_management/locale/en/LC_MESSAGES/django.po apps/user_management/locale/es/LC_MESSAGES/django.mo apps/user_management/locale/es/LC_MESSAGES/django.po apps/user_management/locale/it/LC_MESSAGES/django.mo apps/user_management/locale/pl/LC_MESSAGES/django.mo apps/user_management/locale/pt/LC_MESSAGES/django.mo apps/user_management/locale/pt/LC_MESSAGES/django.po apps/user_management/locale/pt_BR/LC_MESSAGES/django.mo apps/user_management/locale/pt_BR/LC_MESSAGES/django.po apps/user_management/locale/ru/LC_MESSAGES/django.mo apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo apps/web_theme/locale/de_DE/LC_MESSAGES/django.po apps/web_theme/locale/en/LC_MESSAGES/django.po apps/web_theme/locale/es/LC_MESSAGES/django.mo apps/web_theme/locale/es/LC_MESSAGES/django.po apps/web_theme/locale/it/LC_MESSAGES/django.mo apps/web_theme/locale/it/LC_MESSAGES/django.po apps/web_theme/locale/pl/LC_MESSAGES/django.mo apps/web_theme/locale/pl/LC_MESSAGES/django.po apps/web_theme/locale/pt/LC_MESSAGES/django.mo apps/web_theme/locale/pt/LC_MESSAGES/django.po apps/web_theme/locale/pt_BR/LC_MESSAGES/django.mo apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po apps/web_theme/locale/ru/LC_MESSAGES/django.mo apps/web_theme/locale/ru/LC_MESSAGES/django.po misc/compilemessages_all.sh misc/makemessages_all.sh requirements/production.txt settings.py
2012-07-26 21:43:03 -04:00
parent 1c070ab58b 2abe2ceb99
commit 24bf20b9d7
491 changed files with 31132 additions and 4140 deletions
--- a/apps/documents/init.py
+++ b/apps/documents/init.py
@@ -9,7 +9,6 @@ from navigation.api import (bind_links, register_top_menu,
    register_model_list_columns,
    register_sidebar_template, Link)
 from main.api import register_diagnostic, register_maintenance_links
-from history.api import register_history_type
 from history.permissions import PERMISSION_HISTORY_VIEW
 from project_setup.api import register_setup
 from acls.api import class_permissions
@@ -21,12 +20,13 @@ from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
    PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
    PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM,
    PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT,
-    PERMISSION_DOCUMENT_NEW_VERSION)
-from .events import (HISTORY_DOCUMENT_CREATED,
-    HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED)
+    PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_CREATE,
+    PERMISSION_DOCUMENT_TOOLS)
+from .conf.settings import ZOOM_MAX_LEVEL
+from .conf.settings import ZOOM_MIN_LEVEL
 from .conf import settings as document_settings
 from .widgets import document_thumbnail
-from .links import (document_list, document_list_recent, document_create_multiple,
+from .links import (document_list, document_list_recent,
    document_create_siblings, document_view_simple, document_view_advanced,
    document_delete, document_edit, document_download, document_version_download,
    document_find_duplicates, document_find_all_duplicates,
@@ -45,10 +45,6 @@ from .links import (document_page_transformation_list, document_page_transformat
    document_page_rotate_right, document_page_rotate_left, document_page_view_reset)
 from .links import document_clear_image_cache

-# History setup
-register_history_type(HISTORY_DOCUMENT_CREATED)
-register_history_type(HISTORY_DOCUMENT_EDITED)
-register_history_type(HISTORY_DOCUMENT_DELETED)

 # Register document type links
 bind_links([DocumentType], [document_type_document_list, document_type_filename_list, document_type_edit, document_type_delete])
@@ -63,9 +59,9 @@ bind_links([Document], [document_view_simple, document_edit, document_print, doc
 # Document Version links
 bind_links([DocumentVersion], [document_version_revert, document_version_download])

-secondary_menu_links = [document_list_recent, document_list, document_create_multiple]
+secondary_menu_links = [document_list_recent, document_list]

-bind_links(['document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu')
+bind_links(['document_list_recent', 'document_list', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu')
 bind_links([Document], secondary_menu_links, menu_name='secondary_menu')

 # Document page links
--- a/apps/documents/admin.py
+++ b/apps/documents/admin.py
@@ -2,8 +2,6 @@ from __future__ import absolute_import

 from django.contrib import admin

-from metadata.admin import DocumentMetadataInline
-
 from .models import (DocumentType, Document,
    DocumentTypeFilename, DocumentPage,
    DocumentPageTransformation, RecentDocument,
@@ -46,7 +44,7 @@ class DocumentPageTransformationAdmin(admin.ModelAdmin):

 class DocumentAdmin(admin.ModelAdmin):
    inlines = [
-        DocumentMetadataInline, DocumentVersionInline
+        DocumentVersionInline
    ]
    list_display = ('uuid', 'file_filename',)

--- a/apps/documents/events.py
+++ b/apps/documents/events.py
@@ -1,28 +1,26 @@
 from django.utils.translation import ugettext_lazy as _

-HISTORY_DOCUMENT_CREATED = {
-    'namespace': 'documents', 'name': 'document_created',
-    'label': _(u'Document creation'),
-    'summary': _(u'Document "%(content_object)s" created by %(fullname)s.'),
-    'details': _(u'Document "%(content_object)s" created on %(datetime)s by %(fullname)s.'),
-    'expressions': {'fullname': 'user.get_full_name() if user.get_full_name() else user.username'}
-}
+from history.api import EventNamespace, Event

-HISTORY_DOCUMENT_EDITED = {
-    'namespace': 'documents', 'name': 'document_edited',
-    'label': _(u'Document edited'),
-    'summary': _(u'Document "%(content_object)s" edited by %(fullname)s.'),
-    'details': _(u'Document "%(content_object)s" was edited on %(datetime)s by %(fullname)s.  The following changes took place: %(changes)s.'),
-    'expressions': {
+namespace = EventNamespace('documents', _('documents'))
+
+history_document_created = Event(namespace=namespace, name='document_created', label=_(u'Document creation'),
+    summary=_(u'Document "%(content_object)s" created by %(fullname)s.'),
+    details=_(u'Document "%(content_object)s" created on %(datetime)s by %(fullname)s.'),
+    expressions={'fullname': 'user.get_full_name() if user.get_full_name() else user.username'}
+)
+
+history_document_edited = Event(namespace=namespace, name='document_edited', label=_(u'Document edited'),
+    summary=_(u'Document "%(content_object)s" edited by %(fullname)s.'),
+    details=_(u'Document "%(content_object)s" was edited on %(datetime)s by %(fullname)s.  The following changes took place: %(changes)s.'),
+    expressions={
        'fullname': 'user.get_full_name() if user.get_full_name() else user.username',
        'changes': 'u\', \'.join([\'"%s": "%s" -> "%s"\' % (key, value[\'old_value\'], value[\'new_value\']) for key, value in diff.items()])'
    }
-}
+)

-HISTORY_DOCUMENT_DELETED = {
-    'namespace': 'documents', 'name': 'document_deleted',
-    'label': _(u'Document deleted'),
-    'summary': _(u'Document "%(document)s" deleted by %(fullname)s.'),
-    'details': _(u'Document "%(document)s" deleted on %(datetime)s by %(fullname)s.'),
-    'expressions': {'fullname': 'user.get_full_name() if user.get_full_name() else user.username'}
-}
+history_document_deleted = HISTORY_DOCUMENT_DELETED = Event(namespace=namespace, name='document_deleted', label=_(u'Document deleted'),
+    summary=_(u'Document "%(document)s" deleted by %(fullname)s.'),
+    details=_(u'Document "%(document)s" deleted on %(datetime)s by %(fullname)s.'),
+    expressions={'fullname': 'user.get_full_name() if user.get_full_name() else user.username'}
+)
--- a/apps/documents/links.py
+++ b/apps/documents/links.py
@@ -39,7 +39,6 @@ def is_current_version(context):

 document_list = Link(text=_(u'all documents'), view='document_list', sprite='page')
 document_list_recent = Link(text=_(u'recent documents'), view='document_list_recent', sprite='page')
-document_create_multiple = Link(text=_(u'upload new documents'), view='document_create_multiple', sprite='page_add', permissions=[PERMISSION_DOCUMENT_CREATE], children_view_regex=[r'upload_interactive'])
 document_create_siblings = Link(text=_(u'clone metadata'), view='document_create_siblings', args='object.id', sprite='page_copy', permissions=[PERMISSION_DOCUMENT_CREATE])
 document_view_simple = Link(text=_(u'details'), view='document_view_simple', args='object.id', sprite='page', permissions=[PERMISSION_DOCUMENT_VIEW])
 document_view_advanced = Link(text=_(u'properties'), view='document_view_advanced', args='object.id', sprite='page_gear', permissions=[PERMISSION_DOCUMENT_VIEW])
--- a/apps/documents/locale/bg/LC_MESSAGES/django.mo
+++ b/apps/documents/locale/bg/LC_MESSAGES/django.mo
--- a/apps/documents/locale/bg/LC_MESSAGES/django.po
+++ b/apps/documents/locale/bg/LC_MESSAGES/django.po
--- a/apps/documents/locale/de_DE/LC_MESSAGES/django.po
+++ b/apps/documents/locale/de_DE/LC_MESSAGES/django.po
--- a/apps/documents/locale/en/LC_MESSAGES/django.mo
+++ b/apps/documents/locale/en/LC_MESSAGES/django.mo
--- a/apps/documents/locale/en/LC_MESSAGES/django.po
+++ b/apps/documents/locale/en/LC_MESSAGES/django.po
--- a/apps/documents/locale/es/LC_MESSAGES/django.po
+++ b/apps/documents/locale/es/LC_MESSAGES/django.po
--- a/apps/documents/locale/fr/LC_MESSAGES/django.mo
+++ b/apps/documents/locale/fr/LC_MESSAGES/django.mo
--- a/apps/documents/locale/fr/LC_MESSAGES/django.po
+++ b/apps/documents/locale/fr/LC_MESSAGES/django.po
--- a/apps/documents/locale/it/LC_MESSAGES/django.po
+++ b/apps/documents/locale/it/LC_MESSAGES/django.po
--- a/apps/documents/locale/nl_NL/LC_MESSAGES/django.mo
+++ b/apps/documents/locale/nl_NL/LC_MESSAGES/django.mo
--- a/apps/documents/locale/nl_NL/LC_MESSAGES/django.po
+++ b/apps/documents/locale/nl_NL/LC_MESSAGES/django.po
--- a/apps/documents/locale/pl/LC_MESSAGES/django.po
+++ b/apps/documents/locale/pl/LC_MESSAGES/django.po
--- a/apps/documents/locale/pt/LC_MESSAGES/django.po
+++ b/apps/documents/locale/pt/LC_MESSAGES/django.po
--- a/apps/documents/locale/pt_BR/LC_MESSAGES/django.po
+++ b/apps/documents/locale/pt_BR/LC_MESSAGES/django.po
--- a/apps/documents/locale/ru/LC_MESSAGES/django.po
+++ b/apps/documents/locale/ru/LC_MESSAGES/django.po
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -259,6 +259,9 @@ class Document(models.Model):

    @property
    def latest_version(self):
+        # TODO: an IndexError exception here is indicative of a corrupted
+        # database, find out how to handle (display empty doc or automatically
+        # delete with msg to user)
        return self.documentversion_set.order_by('-timestamp')[0]

    @property
--- a/apps/documents/urls.py
+++ b/apps/documents/urls.py
@@ -8,7 +8,6 @@ from .conf.settings import (PREVIEW_SIZE, PRINT_SIZE, THUMBNAIL_SIZE,
 urlpatterns = patterns('documents.views',
    url(r'^list/$', 'document_list', (), 'document_list'),
    url(r'^list/recent/$', 'document_list_recent', (), 'document_list_recent'),
-    url(r'^create/from/local/multiple/$', 'document_create', (), 'document_create_multiple'),

    url(r'^(?P<document_id>\d+)/view/$', 'document_view', (), 'document_view_simple'),
    url(r'^(?P<document_id>\d+)/view/advanced/$', 'document_view', {'advanced': True}, 'document_view_advanced'),
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -26,10 +26,8 @@ from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \
    DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE
 from converter.office_converter import OfficeConverter
 from filetransfers.api import serve_file
-from metadata.forms import MetadataFormSet, MetadataSelectionForm
 from navigation.utils import resolve_to_name
 from permissions.models import Permission
-from history.api import create_history
 from acls.models import AccessEntry
 from common.compressed_files import CompressedFile

@@ -43,16 +41,13 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE,
    PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT,
    PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE,
    PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW)
-from .events import (HISTORY_DOCUMENT_CREATED,
-    HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED)
-from .forms import (DocumentTypeSelectForm,
-        DocumentForm_edit, DocumentPropertiesForm,
+from .events import history_document_edited
+from .forms import (DocumentForm_edit, DocumentPropertiesForm,
        DocumentPreviewForm, DocumentPageForm,
        DocumentPageTransformationForm, DocumentContentForm,
        DocumentPageForm_edit, DocumentPageForm_text, PrintForm,
        DocumentTypeForm, DocumentTypeFilenameForm,
        DocumentTypeFilenameForm_create, DocumentDownloadForm)
-from .wizards import DocumentCreateWizard
 from .models import (Document, DocumentType, DocumentPage,
    DocumentPageTransformation, RecentDocument, DocumentTypeFilename,
    DocumentVersion)
@@ -86,14 +81,6 @@ def document_list(request, object_list=None, title=None, extra_context=None):
        context_instance=RequestContext(request))


-def document_create(request):
-    Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_CREATE])
-
-    wizard = DocumentCreateWizard(form_list=[DocumentTypeSelectForm, MetadataSelectionForm, MetadataFormSet])
-
-    return wizard(request)
-
-
 def document_create_siblings(request, document_id):
    Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_CREATE])

@@ -262,12 +249,10 @@ def document_edit(request, document_id):
            document.filename = new_filename
            document.description = form.cleaned_data['description']
            document.save()
-
-            create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user, 'diff': return_diff(old_document, document, ['filename', 'description'])})
+            history_document_edited.commit(source_object=document, data={'user': request.user, 'diff': return_diff(old_document, document, ['filename', 'description'])})
            RecentDocument.objects.add_document_for_user(request.user, document)

            messages.success(request, _(u'Document "%s" edited successfully.') % document)
-
            return HttpResponseRedirect(document.get_absolute_url())
    else:
        form = DocumentForm_edit(instance=document, initial={
--- a/apps/documents/wizards.py
+++ b/apps/documents/wizards.py
@@ -1,83 +0,0 @@
-from __future__ import absolute_import
-
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect
-from django.utils.http import urlencode
-
-from common.wizard import BoundFormWizard
-
-from metadata.forms import MetadataSelectionForm, MetadataFormSet
-
-from .forms import DocumentTypeSelectForm
-
-
-class DocumentCreateWizard(BoundFormWizard):
-    def generate_metadata_initial_values(self):
-        initial = []
-        for metadata_type in self.metadata_types:
-            initial.append({
-                'metadata_type': metadata_type,
-            })
-
-        for metadata_set in self.metadata_sets:
-            for metadata_set_item in metadata_set.metadatasetitem_set.all():
-                data = {
-                    'metadata_type': metadata_set_item.metadata_type,
-                }
-                if data not in initial:
-                    initial.append(data)
-
-        return initial
-
-    def __init__(self, *args, **kwargs):
-        self.query_dict = {}
-        self.step_titles = kwargs.pop('step_titles', [
-            _(u'step 1 of 3: Document type'),
-            _(u'step 2 of 3: Metadata selection'),
-            _(u'step 3 of 3: Document metadata'),
-            ])
-
-        super(DocumentCreateWizard, self).__init__(*args, **kwargs)
-
-    def render_template(self, request, form, previous_fields, step, context=None):
-        context = {
-            'step_title': self.extra_context['step_titles'][step],
-            'submit_label': _(u'Next step'),
-            'submit_icon_famfam': 'arrow_right',
-        }
-        return super(DocumentCreateWizard, self).render_template(
-            request, form, previous_fields, step, context
-        )
-
-    def parse_params(self, request, *args, **kwargs):
-        self.extra_context = {'step_titles': self.step_titles}
-
-    def process_step(self, request, form, step):
-        if isinstance(form, DocumentTypeSelectForm):
-            self.document_type = form.cleaned_data['document_type']
-            self.initial = {1: {'document_type': self.document_type}}
-
-        if isinstance(form, MetadataSelectionForm):
-            self.metadata_sets = form.cleaned_data['metadata_sets']
-            self.metadata_types = form.cleaned_data['metadata_types']
-            initial_data = self.generate_metadata_initial_values()
-            self.initial = {2: initial_data}
-            if not initial_data:
-                # If there is no metadata selected, finish wizard
-                self.form_list = [DocumentTypeSelectForm, MetadataSelectionForm]
-
-        if isinstance(form, MetadataFormSet):
-            for identifier, metadata in enumerate(form.cleaned_data):
-                self.query_dict['metadata%s_id' % identifier] = metadata['id']
-                self.query_dict['metadata%s_value' % identifier] = metadata['value']
-
-    def get_template(self, step):
-        return 'generic_wizard.html'
-
-    def done(self, request, form_list):
-        if self.document_type:
-            self.query_dict['document_type_id'] = self.document_type.pk
-
-        url = '?'.join([reverse('upload_interactive'), urlencode(self.query_dict, doseq=True)])
-        return HttpResponseRedirect(url)