diff options
| author | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
|---|---|---|
| committer | Prabhu Ramachandran | 2013-04-27 15:28:28 +0530 |
| commit | 8b6ac259503323bc3d8333382d3769e5d10f162a (patch) | |
| tree | 5d260a3db043492ef731b4241cf0f07563591743 /testapp/settings.py | |
| parent | fd044e4a9f08366c9425cb241b7452da2ba904e1 (diff) | |
| parent | 5c7f66806e4be50985655b7c12bf3190ee91ae46 (diff) | |
| download | online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.gz online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.tar.bz2 online_test-8b6ac259503323bc3d8333382d3769e5d10f162a.zip | |
Merge branch 'model_changes' of ...
https://github.com/hardythe1/online_test into master.
Conflicts:
production.cfg
testapp/production.py
Diffstat (limited to 'testapp/settings.py')
| -rw-r--r-- | testapp/settings.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/testapp/settings.py b/testapp/settings.py index f1c48b9..0002476 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -89,7 +89,7 @@ STATIC_URL = '/static/' # URL prefix for admin static files -- CSS, JavaScript and images. # Make sure to use a trailing slash. # Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = URL_ROOT + '/static/admin/' +ADMIN_MEDIA_PREFIX = '/static/admin/' # Additional locations of static files STATICFILES_DIRS = ( @@ -123,6 +123,8 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', + ) ROOT_URLCONF = '%s.urls'%(basename(CURDIR)) @@ -143,10 +145,12 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', # Uncomment the next line to enable the admin: 'django.contrib.admin', + 'taggit', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'south', 'exam', + 'taggit_autocomplete_modified', + 'debug_toolbar', ) # A sample logging configuration. The only tangible logging |