Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete dead SUBDOMAIN_BRANDING setting.

Browse Source
This commit is contained in:
Renzo Lucioni
2015-12-15 14:38:29 -05:00
parent 9e5eda0ab6
commit 23c582d01d
5 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/envs/aws.py
View File

@@ -306,7 +306,6 @@ EVENT_TRACKING_BACKENDS['tracking_logs']['OPTIONS']['backends'].update(AUTH_TOKE
EVENT_TRACKING_BACKENDS['segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend( EVENT_TRACKING_BACKENDS['segmentio']['OPTIONS']['processors'][0]['OPTIONS']['whitelist'].extend(
AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", [])) AUTH_TOKENS.get("EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST", []))
SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', []) VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
##### ACCOUNT LOCKOUT DEFAULT PARAMETERS ##### ##### ACCOUNT LOCKOUT DEFAULT PARAMETERS #####

1
lms/envs/aws.py
View File

@@ -270,7 +270,6 @@ LOGGING = get_logger_config(LOG_DIR,
service_variant=SERVICE_VARIANT) service_variant=SERVICE_VARIANT)
COURSE_LISTINGS = ENV_TOKENS.get('COURSE_LISTINGS', {}) COURSE_LISTINGS = ENV_TOKENS.get('COURSE_LISTINGS', {})
SUBDOMAIN_BRANDING = ENV_TOKENS.get('SUBDOMAIN_BRANDING', {})
VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', []) VIRTUAL_UNIVERSITIES = ENV_TOKENS.get('VIRTUAL_UNIVERSITIES', [])
META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {}) META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '') COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')

2
lms/envs/cms/dev.py
View File

@@ -10,8 +10,6 @@ from ..dev import *
FEATURES['AUTH_USE_CERTIFICATES'] = False FEATURES['AUTH_USE_CERTIFICATES'] = False
SUBDOMAIN_BRANDING['edge'] = 'edge'
SUBDOMAIN_BRANDING['preview.edge'] = 'edge'
VIRTUAL_UNIVERSITIES = ['edge'] VIRTUAL_UNIVERSITIES = ['edge']
# Turn off this flag because it will render 'Edit / QA' links for all instructor viewings of # Turn off this flag because it will render 'Edit / QA' links for all instructor viewings of

6
lms/envs/common.py
View File

@@ -73,11 +73,6 @@ FEATURES = {
## Doing so will cause all courses to be released on production ## Doing so will cause all courses to be released on production
'DISABLE_START_DATES': False, # When True, all courses will be active, regardless of start date 'DISABLE_START_DATES': False, # When True, all courses will be active, regardless of start date
# When True, will override certain branding with university specific values
# Expects a SUBDOMAIN_BRANDING dictionary that maps the subdomain to the
# university to use for branding purposes
'SUBDOMAIN_BRANDING': False,
# for consistency in user-experience, keep the value of the following 3 settings # for consistency in user-experience, keep the value of the following 3 settings
# in sync with the corresponding ones in cms/envs/common.py # in sync with the corresponding ones in cms/envs/common.py
'ENABLE_DISCUSSION_SERVICE': True, 'ENABLE_DISCUSSION_SERVICE': True,
@@ -674,7 +669,6 @@ OPTIMIZELY_PROJECT_ID = None
######################## subdomain specific settings ########################### ######################## subdomain specific settings ###########################
COURSE_LISTINGS = {} COURSE_LISTINGS = {}
SUBDOMAIN_BRANDING = {}
VIRTUAL_UNIVERSITIES = [] VIRTUAL_UNIVERSITIES = []
############# XBlock Configuration ########## ############# XBlock Configuration ##########

11
lms/envs/dev.py
View File

@@ -20,7 +20,6 @@ TEMPLATE_DEBUG = True
HTTPS = 'off' HTTPS = 'off'
FEATURES['DISABLE_START_DATES'] = False FEATURES['DISABLE_START_DATES'] = False
FEATURES['ENABLE_SQL_TRACKING_LOGS'] = True FEATURES['ENABLE_SQL_TRACKING_LOGS'] = True
FEATURES['SUBDOMAIN_BRANDING'] = True
FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True
FEATURES['ENABLE_SERVICE_STATUS'] = True FEATURES['ENABLE_SERVICE_STATUS'] = True
FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True # Enable email for all Studio courses FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True # Enable email for all Studio courses
@@ -128,16 +127,6 @@ COURSE_LISTINGS = {
'sjsu': ['MITx/6.002x-EE98/2012_Fall_SJSU'], 'sjsu': ['MITx/6.002x-EE98/2012_Fall_SJSU'],
} }
SUBDOMAIN_BRANDING = {
'sjsu': 'MITx',
'mit': 'MITx',
'berkeley': 'BerkeleyX',
'harvard': 'HarvardX',
'openedx': 'openedx',
'edge': 'edge',
}
# List of `university` landing pages to display, even though they may not # List of `university` landing pages to display, even though they may not
# have an actual course with that org set # have an actual course with that org set
VIRTUAL_UNIVERSITIES = [] VIRTUAL_UNIVERSITIES = []