Roberto Rosario 3b03af9295 Merge branch 'feature/lts' into merge_test ...

Conflicts:
	mayan/apps/documents/api_views.py
	mayan/apps/documents/models.py
	mayan/apps/folders/__init__.py
	mayan/apps/folders/urls.py
	mayan/apps/folders/views.py
	mayan/apps/tags/urls.py
	mayan/apps/tags/views.py
	mayan/settings/base.py

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

..

locale

Merge branch 'master' into development

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

migrations

The timestamp field is used constantly to determine the latest version of a document, index it

2014-07-22 02:17:18 -04:00

static/images/icons

Initial changes to support the new Django 1.6 project structure

2014-06-15 13:13:21 +02:00

templates

Remove remarked code

2014-07-07 02:41:27 -04:00

templatetags

PEP8 cleanups, unused imports cleanups

2014-06-29 14:14:27 -04:00

__init__.py

Merge branch 'feature/lts' into merge_test

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

admin.py

Old remaked and unused code removal

2014-07-25 21:27:30 -04:00

api_views.py

Merge branch 'feature/lts' into merge_test

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

cleanup.py

Initial changes to support the new Django 1.6 project structure

2014-06-15 13:13:21 +02:00

events.py

Quick fix for issue #24

2014-07-25 21:31:34 -04:00

exceptions.py

Initial changes to support the new Django 1.6 project structure

2014-06-15 13:13:21 +02:00

forms.py

Allow documents with no versions to exist, previously these were considered an anomaly and were unhandled

2014-07-22 02:34:12 -04:00

links.py

Capitalize messages of documents app modules __init__ and links

2014-09-11 13:05:13 -04:00

literals.py

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

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

managers.py

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

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

models.py

Merge branch 'feature/lts' into merge_test

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

permissions.py

Initial changes to support the new Django 1.6 project structure

2014-06-15 13:13:21 +02:00

registry.py

PEP8 cleanup, unused imports, missing imports, style cleanups

2014-07-10 02:45:19 -04:00

runtime.py

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

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

serializers.py

Add id to the document serializer, add required=False to the document type <-> document serialierz relation

2014-09-21 23:15:55 -04:00

settings.py

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

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

statistics.py

Backport statistics app, remove statistic code from the main app, convert the documents and ocr apps to use the new statictics app code

2014-07-04 01:46:16 -04:00

tests.py

Merge branch 'hotfix/test_for_issue_46' into development

2014-09-30 14:47:17 -04:00

urls.py

Merge branch 'feature/lts' into merge_test

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

utils.py

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

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

views.py

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

2014-10-02 17:33:56 -04:00

widgets.py

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

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