Finished feature

This commit is contained in:
Fergal Moran
2015-11-11 22:14:31 +00:00
parent f8b69568e7
commit aed346a897
21 changed files with 5958 additions and 16 deletions

View File

@@ -5,13 +5,12 @@ from datetime import timedelta
from django.core.urlresolvers import reverse_lazy
from django.conf import global_settings
from dss import storagesettings
from utils import here
from dss.localsettings import *
from dss.storagesettings import *
from dss.paymentsettings import *
from dss.logsettings import *
from dss.pipelinesettings import *
from dss.psa import *
from dss.celerysettings import *
@@ -59,12 +58,16 @@ STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'compressor.finders.CompressorFinder',
'pipeline.finders.PipelineFinder',
)
STATICFILES_DIRS = (
here('static'),
)
# STATICFILES_STORAGE = 'pipeline.storage.PipelineCachedStorage'
STATICFILES_STORAGE = 'django_pipeline_forgiving.storages.PipelineForgivingStorage'
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
'django_facebook.context_processors.facebook',
'django.core.context_processors.request',
@@ -115,6 +118,8 @@ INSTALLED_APPS = (
'allauth.socialaccount.providers.google',
'allauth.socialaccount.providers.twitter',
'pipeline',
'corsheaders',
'sorl.thumbnail',
'djcelery',
@@ -172,7 +177,6 @@ REALTIME_HEADERS = {
'content-type': 'application/json'
}
REST_FRAMEWORK = {
# Use hyperlinked styles by default.
# Only used if the `serializer_class` attribute is not set on a view.
@@ -217,7 +221,6 @@ WAVEFORM_URL = '{0}waveforms/'.format(CDN_URL)
STREAM_URL = '{0}mixes/'.format(CDN_URL)
AUDIO_URL = '{0}mixes/'.format(CDN_URL)
NOTIFICATIONS_FROM_ADDRESS = "admin@deepsouthsounds.com"
CORS_ORIGIN_ALLOW_ALL = True
@@ -236,4 +239,4 @@ CORS_ALLOW_HEADERS = (
'x-csrftoken'
)
""" End static settings """
""" End static settings """