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

change zh_CN po mo

2014-09-30 11:00:39 +08:00

migrations

PEP8 cleanups

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

templates

Initial changes to support the new Django 1.6 project structure

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

templatetags

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

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

__init__.py

Merge branch 'feature/lts' into merge_test

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

admin.py

Initial changes to support the new Django 1.6 project structure

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

api_views.py

Add document folder list API endpoint

2014-10-03 09:28:31 -04:00

cleanup.py

Initial changes to support the new Django 1.6 project structure

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

forms.py

Reorganize import in the folders app

2014-06-20 18:33:47 -04:00

links.py

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

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

models.py

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

2014-10-02 01:17:27 -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

Reorganize import in the folders app

2014-06-20 18:33:47 -04:00

serializers.py

A beautiful hack for an unknown problem: hidden imports. Hide the import for DocumentSerializer otherwise an unexplained ImportError is raised

2014-09-21 23:17:10 -04:00

tests.py

Switch tests from django.utils.unittest.TestCase to django.test.TestCase

2014-07-18 03:02:27 -04:00

urls.py

Merge branch 'feature/lts' into merge_test

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

views.py

Merge branch 'feature/lts' into merge_test

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