From: Javyer Der Derian <javier@tribalo.net>
Date: Thu, 17 Apr 2014 21:59:05 +0000 (-0300)
Subject: Merge pull request #46 from udacity/subfolder_fixes
X-Git-Tag: live~21
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/cdf6f5f965021228d2a411d23726eda56db0b5a7?hp=-c

Merge pull request #46 from udacity/subfolder_fixes

Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder
---

cdf6f5f965021228d2a411d23726eda56db0b5a7
diff --combined settings_local.py.dist
index 81c1eaa,ad178f6..e687228
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@@ -58,6 -58,11 +58,11 @@@ DATABASES = 
  CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
  #CACHE_BACKEND = 'dummy://'
  SESSION_ENGINE = 'django.contrib.sessions.backends.db'
+ # Customize the values below if OSQA is in a subfolder and especially you're planning on
+ # running multiple Django applications (OSQA or others) on the same domain in different
+ # subfolders
+ #SESSION_COOKIE_PATH = '/'
+ #CSRF_COOKIE_PATH = '/'
  
  # This should be equal to your domain name, plus the web application context.
  # This shouldn't be followed by a trailing slash.
@@@ -72,6 -77,7 +77,6 @@@ TIME_ZONE = 'America/New_York
  USE_I18N = True
  LANGUAGE_CODE = 'en'
  
 -DJANGO_VERSION = 1.1
  OSQA_DEFAULT_SKIN = 'default'
  
  DISABLED_MODULES = ['books', 'recaptcha', 'project_badges']