Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation

Conflicts: cms/envs/common.py
2013-04-04 17:34:52 +00:00
parent 1969a6633e 72ce1af982
commit 2e852d16ac
103 changed files with 5604 additions and 4484 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -35,6 +35,7 @@ MITX_FEATURES = {
    'AUTH_USE_MIT_CERTIFICATES': False,
    'STUB_VIDEO_FOR_TESTING': False,   # do not display video when running automated acceptance tests
    'STAFF_EMAIL': '',			# email address for staff (eg to request course creation)
+    'STUDIO_NPS_SURVEY': True, 
 }
 ENABLE_JASMINE = False