Roberto Rosario efdf08eb90 Merge branch 'development' ...

Conflicts:
	docs/credits/contributors.rst
	docs/index.rst
	docs/intro/installation.rst
	mayan/apps/converter/templates/converter_file_formats_help.html
	mayan/apps/document_indexing/templates/indexing_help.html
	mayan/apps/documents/templates/document_types_help.html
	mayan/apps/documents/templates/recent_document_list_help.html
	mayan/apps/dynamic_search/templates/search_help.html
	mayan/apps/folders/templates/folders_help.html
	mayan/apps/linking/templates/smart_links_help.html
	mayan/apps/metadata/templates/metadata_set_help.html
	mayan/apps/metadata/templates/metadata_type_help.html

2015-02-10 08:36:50 -04:00

..

apps

Merge branch 'development'

2015-02-10 08:36:50 -04:00

bin

Improve the settings method, allow for execution of mayan-edms.py without an existing local.py file

2014-10-09 19:34:51 -04:00

media

Remove the SITE_ROOT settings variable and use Django's MEDIA_ROOT instead.

2014-07-11 01:06:50 -04:00

settings

Add documents,ocr and converter logging to the settings files used for travis testing

2015-01-28 18:36:09 -04:00

__init__.py

Add from __future__ import unicode_literals, issue #37

2015-01-19 04:06:40 -04:00

celery.py

Add from __future__ import unicode_literals, issue #37

2015-01-19 04:06:40 -04:00

urls.py

Add from __future__ import unicode_literals, issue #37

2015-01-19 04:06:40 -04:00

wsgi.py

Add production settings file and point wsgi by default to it

2014-08-18 01:29:23 -04:00