Accepting incoming merge of the jambazov feature branch. Mostly includes new bug...

[osqa.git] / forum / settings / __init__.py

diff --git a/forum/settings/__init__.py b/forum/settings/__init__.py
index 6d5b03f6f1f324d2214ab9581abbb6b135d8fdcd..e10fc76b0f6f1fb0a3ddb6dcce1a3b3e3a103d9a 100644 (file)
--- a/forum/settings/__init__.py
+++ b/forum/settings/__init__.py
@@ -13,12 +13,15 @@ MAINTAINANCE_MODE = Setting('MAINTAINANCE_MODE', None)
 
 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")
 DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)
 
 SETTINGS_PACK = Setting('SETTINGS_PACK', "default")
 DJSTYLE_ADMIN_INTERFACE = Setting('DJSTYLE_ADMIN_INTERFACE', True)

+NODE_MAN_FILTERS = Setting('NODE_MAN_FILTERS', [])

 
 APP_URL = djsettings.APP_URL
 
 APP_URL = djsettings.APP_URL

-FORUM_SCRIPT_ALIAS = djsettings.FORUM_SCRIPT_ALIAS
+APP_BASE_URL = djsettings.APP_BASE_URL
+FORCE_SCRIPT_NAME = djsettings.FORCE_SCRIPT_NAME

 OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
 LANGUAGE_CODE = djsettings.LANGUAGE_CODE
 ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX
 OSQA_SKIN = djsettings.OSQA_DEFAULT_SKIN
 LANGUAGE_CODE = djsettings.LANGUAGE_CODE
 ADMIN_MEDIA_PREFIX = djsettings.ADMIN_MEDIA_PREFIX

+ONLINE_USERS = Setting('ONLINE_USERS', {})

 
 
 from basic import *
 
 
 from basic import *


@@ -37,6 +40,7 @@ from moderation import *
 from users import *
 from static import *
 from urls import *
 from users import *
 from static import *
 from urls import *

+from accept import *

 
 BADGES_SET = SettingSet('badges', _('Badges config'), _("Configure badges on your OSQA site."), 500)
 
 
 BADGES_SET = SettingSet('badges', _('Badges config'), _("Configure badges on your OSQA site."), 500)