From 456e24961954c3c34f5ad2d0ce035440cb6a671e Mon Sep 17 00:00:00 2001
From: Rick Ross <rick@dzone.com>
Date: Sat, 16 Jan 2010 17:45:40 -0500
Subject: added a short name setting for the app and modified the default about
 page to use it

---
 settings_local.py.dist | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 5447e517..14b22e5a 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -3,7 +3,7 @@ import os.path
 from django.utils.translation import ugettext as _
 
 SITE_SRC_ROOT = os.path.dirname(__file__) 
-LOG_FILENAME = 'django.lanai.log'
+LOG_FILENAME = 'django.osqa.log'
 
 #for logging
 import logging
@@ -18,10 +18,12 @@ DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 
-DATABASE_NAME = 'cnprog'             # Or path to database file if using sqlite3.
+DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
 DATABASE_ENGINE = 'mysql'  #mysql, etc
+DATABASE_HOST = ''
+DATABASE_PORT = ''
 
 #Moved from settings.py for better organization. (please check it up to clean up settings.py)
 
@@ -30,13 +32,13 @@ SERVER_EMAIL = ''
 DEFAULT_FROM_EMAIL = ''
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[CNPROG] '
-EMAIL_HOST='cnprog.com'
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.net'
 EMAIL_PORT='25'
 EMAIL_USE_TLS=False
 
 #LOCALIZATIONS
-TIME_ZONE = 'America/Tijuana'
+TIME_ZONE = 'America/New_York'
 
 ###########################
 #
@@ -48,11 +50,12 @@ FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
 
 
 #OTHER SETTINGS
-APP_TITLE = u'CNPROG Q&A Forum'
-APP_KEYWORDS = u'CNPROG,forum,community'
+APP_TITLE = u'OSQA: Open Source Q&A Forum'
+APP_SHORT_NAME = u'OSQA'
+APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
 APP_DESCRIPTION = u'Ask and answer questions.'
 APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright CNPROG, 2009. Some rights reserved under creative commons license.'
+APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
 LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
 GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
 
@@ -61,25 +64,25 @@ LANGUAGE_CODE = 'en'
 EMAIL_VALIDATION = 'off' #string - on|off
 MIN_USERNAME_LENGTH = 1
 EMAIL_UNIQUE = False
-APP_URL = 'http://cnprog.com' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA='
+APP_URL = 'http://osqa.net' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = ''
 GOOGLE_ANALYTICS_KEY = ''
 BOOKS_ON = False 
 WIKI_ON = True 
 USE_EXTERNAL_LEGACY_LOGIN = False
-EXTERNAL_LEGACY_LOGIN_HOST = 'login.cnprog.com'
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
-EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">CNPROG</span>'
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
 FEEDBACK_SITE_URL = None #None or url
 
 DJANGO_VERSION = 1.1
 RESOURCE_REVISION=4
 
-USE_SPHINX_SEARCH = True #if True all SPHINX_* settings are required
+USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
 #also sphinx search engine and djangosphinxs app must be installed
 #sample sphinx configuration file is /sphinx/sphinx.conf
 SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
-SPHINX_SEARCH_INDICES=('cnprog',) #a tuple of index names remember about a comma after the 
+SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
 #last item, especially if you have just one :)
 SPHINX_SERVER='localhost'
 SPHINX_PORT=3312
-- 
cgit v1.2.3-1-g7c22


From c18bda49f13afb4e2eaaf9ccb35098ee174e3afc Mon Sep 17 00:00:00 2001
From: hrcerqueira <hrcerqueira@gmail.com>
Date: Thu, 21 Jan 2010 13:07:11 +0000
Subject: Added the basic html and javascript of fb connect, and a setting in
 settings_local.py.dist for the fb api key.

---
 settings_local.py.dist | 179 +++++++++++++++++++++++++------------------------
 1 file changed, 91 insertions(+), 88 deletions(-)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 14b22e5a..8d645025 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,88 +1,91 @@
-# encoding:utf-8
-import os.path
-from django.utils.translation import ugettext as _
-
-SITE_SRC_ROOT = os.path.dirname(__file__) 
-LOG_FILENAME = 'django.osqa.log'
-
-#for logging
-import logging
-logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
-
-#ADMINS and MANAGERS
-ADMINS = (('Forum Admin', 'forum@example.com'),)
-MANAGERS = ADMINS
-
-#DEBUG SETTINGS
-DEBUG = False 
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''               # Not used with sqlite3.
-DATABASE_PASSWORD = ''               # Not used with sqlite3.
-DATABASE_ENGINE = 'mysql'  #mysql, etc
-DATABASE_HOST = ''
-DATABASE_PORT = ''
-
-#Moved from settings.py for better organization. (please check it up to clean up settings.py)
-
-#email server settings
-SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = ''
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[OSQA] '
-EMAIL_HOST='osqa.net'
-EMAIL_PORT='25'
-EMAIL_USE_TLS=False
-
-#LOCALIZATIONS
-TIME_ZONE = 'America/New_York'
-
-###########################
-#
-#   this will allow running your forum with url like http://site.com/forum
-#
-#   FORUM_SCRIPT_ALIAS = 'forum/'
-#
-FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-
-
-#OTHER SETTINGS
-APP_TITLE = u'OSQA: Open Source Q&A Forum'
-APP_SHORT_NAME = u'OSQA'
-APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
-APP_DESCRIPTION = u'Ask and answer questions.'
-APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
-LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
-GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
-
-USE_I18N = True
-LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off' #string - on|off
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-APP_URL = 'http://osqa.net' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = ''
-GOOGLE_ANALYTICS_KEY = ''
-BOOKS_ON = False 
-WIKI_ON = True 
-USE_EXTERNAL_LEGACY_LOGIN = False
-EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
-EXTERNAL_LEGACY_LOGIN_PORT = 80
-EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
-FEEDBACK_SITE_URL = None #None or url
-
-DJANGO_VERSION = 1.1
-RESOURCE_REVISION=4
-
-USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
-#also sphinx search engine and djangosphinxs app must be installed
-#sample sphinx configuration file is /sphinx/sphinx.conf
-SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
-SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
-#last item, especially if you have just one :)
-SPHINX_SERVER='localhost'
-SPHINX_PORT=3312
+# encoding:utf-8
+import os.path
+from django.utils.translation import ugettext as _
+
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.osqa.log'
+
+#for logging
+import logging
+logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
+
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'forum@example.com'),)
+MANAGERS = ADMINS
+
+#DEBUG SETTINGS
+DEBUG = False 
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
+DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
+DATABASE_USER = ''               # Not used with sqlite3.
+DATABASE_PASSWORD = ''               # Not used with sqlite3.
+DATABASE_ENGINE = 'mysql'  #mysql, etc
+DATABASE_HOST = ''
+DATABASE_PORT = ''
+
+#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+
+#email server settings
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = ''
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.net'
+EMAIL_PORT='25'
+EMAIL_USE_TLS=False
+
+#LOCALIZATIONS
+TIME_ZONE = 'America/New_York'
+
+###########################
+#
+#   this will allow running your forum with url like http://site.com/forum
+#
+#   FORUM_SCRIPT_ALIAS = 'forum/'
+#
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
+
+
+#OTHER SETTINGS
+APP_TITLE = u'OSQA: Open Source Q&A Forum'
+APP_SHORT_NAME = u'OSQA'
+APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
+APP_DESCRIPTION = u'Ask and answer questions.'
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
+APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
+
+USE_I18N = True
+LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off' #string - on|off
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://osqa.net' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = ''
+GOOGLE_ANALYTICS_KEY = ''
+BOOKS_ON = False 
+WIKI_ON = True 
+USE_EXTERNAL_LEGACY_LOGIN = False
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
+EXTERNAL_LEGACY_LOGIN_PORT = 80
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
+FEEDBACK_SITE_URL = None #None or url
+
+DJANGO_VERSION = 1.1
+RESOURCE_REVISION=4
+
+USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
+#also sphinx search engine and djangosphinxs app must be installed
+#sample sphinx configuration file is /sphinx/sphinx.conf
+SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
+SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
+#last item, especially if you have just one :)
+SPHINX_SERVER='localhost'
+SPHINX_PORT=3312
+
+#Facebook settings
+FB_API_KEY='' #your api key from facebook
-- 
cgit v1.2.3-1-g7c22


From d305ad98090558eb872c97f69addd2163f8ba5bd Mon Sep 17 00:00:00 2001
From: hrcerqueira <hrcerqueira@gmail.com>
Date: Fri, 22 Jan 2010 01:39:13 +0000
Subject: Handle the case were user logs in with facebook for the first time.

---
 settings_local.py.dist | 1 +
 1 file changed, 1 insertion(+)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 8d645025..55028ba2 100644
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -89,3 +89,4 @@ SPHINX_PORT=3312
 
 #Facebook settings
 FB_API_KEY='' #your api key from facebook
+FB_SECRET='' #your application secret
-- 
cgit v1.2.3-1-g7c22


From c4ed047a3b2248aa7544df02f9d1bceaeb8d633c Mon Sep 17 00:00:00 2001
From: hrcerqueira <hrcerqueira@gmail.com>
Date: Fri, 22 Jan 2010 20:55:07 +0000
Subject: Handled the returning user case, and the proper redirects in the case
 of an anonymous question or answer.

---
 settings_local.py.dist | 184 ++++++++++++++++++++++++-------------------------
 1 file changed, 92 insertions(+), 92 deletions(-)
 mode change 100644 => 100755 settings_local.py.dist

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
old mode 100644
new mode 100755
index 55028ba2..443b73d1
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -1,92 +1,92 @@
-# encoding:utf-8
-import os.path
-from django.utils.translation import ugettext as _
-
-SITE_SRC_ROOT = os.path.dirname(__file__) 
-LOG_FILENAME = 'django.osqa.log'
-
-#for logging
-import logging
-logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
-
-#ADMINS and MANAGERS
-ADMINS = (('Forum Admin', 'forum@example.com'),)
-MANAGERS = ADMINS
-
-#DEBUG SETTINGS
-DEBUG = False 
-TEMPLATE_DEBUG = DEBUG
-INTERNAL_IPS = ('127.0.0.1',)
-
-DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''               # Not used with sqlite3.
-DATABASE_PASSWORD = ''               # Not used with sqlite3.
-DATABASE_ENGINE = 'mysql'  #mysql, etc
-DATABASE_HOST = ''
-DATABASE_PORT = ''
-
-#Moved from settings.py for better organization. (please check it up to clean up settings.py)
-
-#email server settings
-SERVER_EMAIL = ''
-DEFAULT_FROM_EMAIL = ''
-EMAIL_HOST_USER = ''
-EMAIL_HOST_PASSWORD = ''
-EMAIL_SUBJECT_PREFIX = '[OSQA] '
-EMAIL_HOST='osqa.net'
-EMAIL_PORT='25'
-EMAIL_USE_TLS=False
-
-#LOCALIZATIONS
-TIME_ZONE = 'America/New_York'
-
-###########################
-#
-#   this will allow running your forum with url like http://site.com/forum
-#
-#   FORUM_SCRIPT_ALIAS = 'forum/'
-#
-FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-
-
-#OTHER SETTINGS
-APP_TITLE = u'OSQA: Open Source Q&A Forum'
-APP_SHORT_NAME = u'OSQA'
-APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
-APP_DESCRIPTION = u'Ask and answer questions.'
-APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
-APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
-LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
-GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
-
-USE_I18N = True
-LANGUAGE_CODE = 'en'
-EMAIL_VALIDATION = 'off' #string - on|off
-MIN_USERNAME_LENGTH = 1
-EMAIL_UNIQUE = False
-APP_URL = 'http://osqa.net' #used by email notif system and RSS
-GOOGLE_SITEMAP_CODE = ''
-GOOGLE_ANALYTICS_KEY = ''
-BOOKS_ON = False 
-WIKI_ON = True 
-USE_EXTERNAL_LEGACY_LOGIN = False
-EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
-EXTERNAL_LEGACY_LOGIN_PORT = 80
-EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
-FEEDBACK_SITE_URL = None #None or url
-
-DJANGO_VERSION = 1.1
-RESOURCE_REVISION=4
-
-USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
-#also sphinx search engine and djangosphinxs app must be installed
-#sample sphinx configuration file is /sphinx/sphinx.conf
-SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
-SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
-#last item, especially if you have just one :)
-SPHINX_SERVER='localhost'
-SPHINX_PORT=3312
-
-#Facebook settings
-FB_API_KEY='' #your api key from facebook
-FB_SECRET='' #your application secret
+# encoding:utf-8
+import os.path
+from django.utils.translation import ugettext as _
+
+SITE_SRC_ROOT = os.path.dirname(__file__) 
+LOG_FILENAME = 'django.osqa.log'
+
+#for logging
+import logging
+logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
+
+#ADMINS and MANAGERS
+ADMINS = (('Forum Admin', 'forum@example.com'),)
+MANAGERS = ADMINS
+
+#DEBUG SETTINGS
+DEBUG = False 
+TEMPLATE_DEBUG = DEBUG
+INTERNAL_IPS = ('127.0.0.1',)
+
+DATABASE_NAME = 'osqa'             # Or path to database file if using sqlite3.
+DATABASE_USER = ''               # Not used with sqlite3.
+DATABASE_PASSWORD = ''               # Not used with sqlite3.
+DATABASE_ENGINE = 'mysql'  #mysql, etc
+DATABASE_HOST = ''
+DATABASE_PORT = ''
+
+#Moved from settings.py for better organization. (please check it up to clean up settings.py)
+
+#email server settings
+SERVER_EMAIL = ''
+DEFAULT_FROM_EMAIL = ''
+EMAIL_HOST_USER = ''
+EMAIL_HOST_PASSWORD = ''
+EMAIL_SUBJECT_PREFIX = '[OSQA] '
+EMAIL_HOST='osqa.net'
+EMAIL_PORT='25'
+EMAIL_USE_TLS=False
+
+#LOCALIZATIONS
+TIME_ZONE = 'America/New_York'
+
+###########################
+#
+#   this will allow running your forum with url like http://site.com/forum
+#
+#   FORUM_SCRIPT_ALIAS = 'forum/'
+#
+FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
+
+
+#OTHER SETTINGS
+APP_TITLE = u'OSQA: Open Source Q&A Forum'
+APP_SHORT_NAME = u'OSQA'
+APP_KEYWORDS = u'OSQA,CNPROG,forum,community'
+APP_DESCRIPTION = u'Ask and answer questions.'
+APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>'
+APP_COPYRIGHT = 'Copyright OSQA, 2009. Some rights reserved under creative commons license.'
+LOGIN_URL = '/%s%s%s' % (FORUM_SCRIPT_ALIAS,'account/','signin/')
+GREETING_URL = LOGIN_URL #may be url of "faq" page or "about", etc
+
+USE_I18N = True
+LANGUAGE_CODE = 'en'
+EMAIL_VALIDATION = 'off' #string - on|off
+MIN_USERNAME_LENGTH = 1
+EMAIL_UNIQUE = False
+APP_URL = 'http://osqa.net' #used by email notif system and RSS
+GOOGLE_SITEMAP_CODE = ''
+GOOGLE_ANALYTICS_KEY = ''
+BOOKS_ON = False 
+WIKI_ON = True 
+USE_EXTERNAL_LEGACY_LOGIN = False
+EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
+EXTERNAL_LEGACY_LOGIN_PORT = 80
+EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
+FEEDBACK_SITE_URL = None #None or url
+
+DJANGO_VERSION = 1.1
+RESOURCE_REVISION=4
+
+USE_SPHINX_SEARCH = False #if True all SPHINX_* settings are required
+#also sphinx search engine and djangosphinxs app must be installed
+#sample sphinx configuration file is /sphinx/sphinx.conf
+SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
+SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma after the 
+#last item, especially if you have just one :)
+SPHINX_SERVER='localhost'
+SPHINX_PORT=3312
+
+#Facebook settings
+FB_API_KEY='' #your api key from facebook
+FB_SECRET='' #your application secret
-- 
cgit v1.2.3-1-g7c22


From ad2e22b999b3b795f60e0f95abcaf3b339567294 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 24 Jan 2010 19:53:24 -0500
Subject: recaptcha for conventional registration\n\ simpler email subscription
 form at registration\n\ fixed urls in rss feed\n\ added experimental remote
 password login api (cleartext password for remote site entered locally)\n\
 included example for Mediawiki Authentication plugin\n\ very simple message
 to everyone management command

---
 settings_local.py.dist | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 443b73d1..f271a0b0 100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -2,6 +2,13 @@
 import os.path
 from django.utils.translation import ugettext as _
 
+def check_local_setting(name, value):
+    local_vars = locals()
+    if name in local_vars and local_var[name] == value:
+        return True
+    else:
+        return False
+
 SITE_SRC_ROOT = os.path.dirname(__file__) 
 LOG_FILENAME = 'django.osqa.log'
 
@@ -87,6 +94,11 @@ SPHINX_SEARCH_INDICES=('osqa',) #a tuple of index names remember about a comma a
 SPHINX_SERVER='localhost'
 SPHINX_PORT=3312
 
+#please get these at recaptcha.net
+RECAPTCHA_PRIVATE_KEY='...'
+RECAPTCHA_PUBLIC_KEY='...'
+
 #Facebook settings
+USE_FB_CONNECT=True
 FB_API_KEY='' #your api key from facebook
 FB_SECRET='' #your application secret
-- 
cgit v1.2.3-1-g7c22


From 955f0853655cd499a12f69ca35768802ddbbac38 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 2 Feb 2010 20:48:41 -0500
Subject: remove experimental and unused files, small cleanups

---
 settings_local.py.dist | 1 +
 1 file changed, 1 insertion(+)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index f271a0b0..7fbc0729 100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -81,6 +81,7 @@ EXTERNAL_LEGACY_LOGIN_HOST = 'login.osqa.net'
 EXTERNAL_LEGACY_LOGIN_PORT = 80
 EXTERNAL_LEGACY_LOGIN_PROVIDER_NAME = '<span class="orange">OSQA</span>'
 FEEDBACK_SITE_URL = None #None or url
+EDITABLE_SCREEN_NAME = False #True or False - can user change screen name?
 
 DJANGO_VERSION = 1.1
 RESOURCE_REVISION=4
-- 
cgit v1.2.3-1-g7c22


From b6cce3357041aa7dfbb59ae12355f7c3ed69f687 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 5 Feb 2010 19:15:09 -0500
Subject: added logging messages to django_authopenid library for debugging, \
 also fixed up format of logging output and added HOW_TO_DEBUG file

---
 settings_local.py.dist | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 7fbc0729..0ef11eca 100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -15,6 +15,11 @@ LOG_FILENAME = 'django.osqa.log'
 #for logging
 import logging
 logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
+logging.basicConfig(
+    filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
+    level=logging.DEBUG,
+    format='%(pathname)s TIME: %(asctime)s MSG: %(filename)s:%(funcName)s:%(lineno)d %(message)s',
+)
 
 #ADMINS and MANAGERS
 ADMINS = (('Forum Admin', 'forum@example.com'),)
-- 
cgit v1.2.3-1-g7c22


From 3e7c42f81352ad73a1395ed0601f2d4fdf9b5359 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 5 Feb 2010 19:18:17 -0500
Subject: tiny fix to settings_local.py.dist

---
 settings_local.py.dist | 1 -
 1 file changed, 1 deletion(-)

(limited to 'settings_local.py.dist')

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 0ef11eca..c38e3dd8 100755
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -14,7 +14,6 @@ LOG_FILENAME = 'django.osqa.log'
 
 #for logging
 import logging
-logging.basicConfig(filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME), level=logging.DEBUG,)
 logging.basicConfig(
     filename=os.path.join(SITE_SRC_ROOT, 'log', LOG_FILENAME),
     level=logging.DEBUG,
-- 
cgit v1.2.3-1-g7c22