mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update from development

Browse source
This commit is contained in:
Tom 2016-05-07 23:02:29 +00:00
commit 7d7c682cec
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dynamicweb/settings/base.py
View file

@ -281,12 +281,12 @@ CACHES = {
} }
} }
if LOGIN_URL is None: #if LOGIN_URL is None:
LOGIN_URL = APP_ROOT_ENDPOINT + 'login/' # LOGIN_URL = APP_ROOT_ENDPOINT + 'login/'
if LOGOUT_URL is None: #if LOGOUT_URL is None:
LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/' # LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/'
if LOGIN_REDIRECT_URL is None: #if LOGIN_REDIRECT_URL is None:
LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT # LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.7/howto/static-files/ # https://docs.djangoproject.com/en/1.7/howto/static-files/
@ -455,7 +455,7 @@ REGISTRATION_MESSAGE = {'subject': "Validation mail",
STRIPE_API_PRIVATE_KEY = env('STRIPE_API_PRIVATE_KEY') STRIPE_API_PRIVATE_KEY = env('STRIPE_API_PRIVATE_KEY')
STRIPE_API_PUBLIC_KEY = env('STRIPE_API_PUBLIC_KEY') STRIPE_API_PUBLIC_KEY = env('STRIPE_API_PUBLIC_KEY')
DEBUG = True DEBUG = False
if DEBUG: if DEBUG:
from .local import * from .local import *