Skip to content

E
edx-platform
Commit bdcc6bd3 by David Adams Committed by Joe Blaylock
Options

Code additions to enable Ooyala player XBlock. 

Cherry-picked into rc by Joe Blaylock <jrbl@stanford.edu>.

Conflicts:
	cms/djangoapps/contentstore/views/component.py
parent fbae390a
Showing with 3 additions and 1 deletions
cms/djangoapps/contentstore/views/component.py
...@@ -68,7 +68,8 @@ else: ...@@ -68,7 +68,8 @@ else:
'audio', # Embed an audio file. See https://github.com/pmitros/AudioXBlock 'audio', # Embed an audio file. See https://github.com/pmitros/AudioXBlock
'edx_sga', # that weird grading xblock thing - remove this next merge 'edx_sga', # that weird grading xblock thing - remove this next merge
SPLIT_TEST_COMPONENT_TYPE, # Adds A/B test support SPLIT_TEST_COMPONENT_TYPE, # Adds A/B test support
'recommender' # Crowdsourced recommender. Prototype by dli&pmitros. Intended for roll-out in one place in one course. 'recommender', # Crowdsourced recommender. Prototype by dli&pmitros. Intended for roll-out in one place in one course.
'ooyala-player',
] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES ] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES
ADVANCED_COMPONENT_CATEGORY = 'advanced' ADVANCED_COMPONENT_CATEGORY = 'advanced'
......
requirements/edx/github.txt
...@@ -34,3 +34,4 @@ ...@@ -34,3 +34,4 @@
# Third Party XBlocks # Third Party XBlocks
-e git+https://github.com/mitodl/edx-sga@7e308cf676b6f41493d9cf7864296bc1c089b36b#egg=edx-sga -e git+https://github.com/mitodl/edx-sga@7e308cf676b6f41493d9cf7864296bc1c089b36b#egg=edx-sga
-e git+https://github.com/edx-solutions/xblock-ooyala.git@32d52edaa820dbdbf846d8a84f6bccbf0b9c8218#egg=xblock_ooyala_player-master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment