Roberto Rosario 32b3ae7267 Merge branch 'feature/optimize_thumbnails' into development ...

Conflicts:
	mayan/apps/main/templates/base.html

2014-10-01 05:16:28 -04:00

..

locale

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

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

management

Use Django's method to generate the SECRET_KEY setting

2014-07-28 03:23:51 -04:00

static

Merge branch 'feature/optimize_thumbnails' into development

2014-10-01 05:16:28 -04:00

templates

Merge branch 'feature/optimize_thumbnails' into development

2014-10-01 05:16:28 -04:00

templatetags

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

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

__init__.py

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

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

api.py

Initial changes to support the new Django 1.6 project structure

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

links.py

Add app url namespacing to the common and main apps, fix missing namespace in the registration app, remove explict reverse_lazy for the LOGIN_URL and LOGIN_REDIRECT_URL these are expected to be views or URLs (failover)

2014-09-09 03:51:23 -04:00

models.py

Initial changes to support the new Django 1.6 project structure

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

settings.py

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

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

urls.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

views.py

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

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