Merge branch 'master' into tests/diana/update-oe-unit-tests

lms/envs/test.py

@@ -17,7 +17,7 @@ from path import path
 MITX_FEATURES['DISABLE_START_DATES'] = True
 
 # Until we have discussion actually working in test mode, just turn it off
-#MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
+MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
 
 # Need wiki for courseware views to work. TODO (vshnayder): shouldn't need it.
 WIKI_ENABLED = True

lms/static/coffee/src/navigation.coffee

@@ -13,6 +13,7 @@ class @Navigation
         active: active
         header: 'h3'
         autoHeight: false
+        heightStyle: 'content'
       $('#accordion .ui-state-active').closest('.chapter').addClass('is-open')
       $('#open_close_accordion a').click @toggle
       $('#accordion').show()