Roberto Rosario 78ecee7266 Merge branch 'gwalborn-master' into test ...

Conflicts:
	mayan/apps/metadata/forms.py

2014-10-07 13:47:02 -04:00

..

acls

Merge branch 'master' into development

2014-10-01 05:19:51 -04:00

app_registry

Update the app API class methods, register the sources app main endpoint, add API doc strings

2014-07-08 18:51:39 -04:00

bootstrap

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

checkouts

Use different queues for the background tasks

2014-10-03 03:22:35 -04:00

common

Merge branch 'master' into development

2014-10-01 05:19:51 -04:00

converter

Add background conversion taks to the converter app

2014-10-03 02:41:10 -04:00

django_gpg

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

document_acls

Update view references to include namespaces

2014-09-06 17:28:40 -04:00

document_comments

Merge branch 'master' into development

2014-10-01 05:19:51 -04:00

document_indexing

More capitalizations, issue #39

2014-10-02 01:23:10 -04:00

document_signatures

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

documents

Convert the document image view to use queued conversion

2014-10-03 16:34:54 -04:00

dynamic_search

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

folders

Don't include the documents contained in the tags or folders results, instead provide a separate, paginates tag and folder endpoint

2014-10-06 03:43:51 -04:00

history

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

installation

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

linking

Import cleanups, reorganization, PEP8 cleanups

2014-10-02 02:01:08 -04:00

lock_manager

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

main

Issue #56, Remove the MAIN_DISABLE_ICONS setting configuration option

2014-10-02 17:54:05 -04:00

metadata

Merge branch 'gwalborn-master' into test

2014-10-07 13:47:02 -04:00

mimetype

PEP8 cleanups

2014-06-30 00:57:53 -04:00

navigation

Issue #56, Remove the MAIN_DISABLE_ICONS setting configuration option

2014-10-02 17:54:05 -04:00

ocr

Use different queues for the background tasks

2014-10-03 03:22:35 -04:00

permissions

Start addressing issue #40 (document, permissions, sources, tags and user_management apps)

2014-10-02 02:25:28 -04:00

project_setup

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

project_tools

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

registration

Issue #39, Explicitly captalize string now that they are not capitalized blindly by the templates

2014-10-02 01:17:27 -04:00

rest_api

Enable token authentication for the API, add API token request view

2014-07-24 01:03:51 -04:00

settings_editor

Move common templates to apps/main/templates/main/*

2014-08-26 02:44:49 -04:00

smart_settings

Import cleanups, reorganization, PEP8 cleanups

2014-10-02 02:01:08 -04:00

sources

Fix message

2014-10-03 23:55:47 -04:00

statistics

Merge branch 'master' into development

2014-10-01 05:19:51 -04:00

storage

Move all settings files from <app>/conf/settings.py to <app>/settings.py

2014-09-11 05:02:40 -04:00

tags

Don't include the documents contained in the tags or folders results, instead provide a separate, paginates tag and folder endpoint

2014-10-06 03:43:51 -04:00

user_management

Merge branch 'feature/lts' into merge_test

2014-10-03 11:41:41 -04:00

web_theme/locale/zh_CN/LC_MESSAGES

Merge branch 'master' into development

2014-10-01 05:19:51 -04:00

__init__.py

Move common templates to apps/main/templates/main/*

2014-08-26 02:44:49 -04:00