Skip to content

E
edx-platform
Commit b1d2e193 by David Adams
Options

Merge pull request #89 from Stanford-Online/dcadams/ooyala_xblock 

Code additions to enable Ooyala player XBlock.
parents 01d5a0c5 5fe42f66
Showing with 3 additions and 1 deletions
cms/djangoapps/contentstore/views/component.py
...@@ -66,7 +66,8 @@ else: ...@@ -66,7 +66,8 @@ else:
'done', # Lets students mark things as done. See https://github.com/pmitros/DoneXBlock 'done', # Lets students mark things as done. See https://github.com/pmitros/DoneXBlock
'audio', # Embed an audio file. See https://github.com/pmitros/AudioXBlock 'audio', # Embed an audio file. See https://github.com/pmitros/AudioXBlock
'split_test', 'split_test',
'edx_sga' 'edx_sga',
'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