Merge pull request #3935 from edx/pmitros/adding-audio-done-xblocks

Added prototype DoneXBlock and AudioXBlock

cms/djangoapps/contentstore/views/component.py

@@ -58,7 +58,13 @@ else:
         'word_cloud',
         'graphical_slider_tool',
         'lti',
-        'concept',
+        # XBlocks from pmitros repos are prototypes. They should not be used
+        # except for edX Learning Sciences experiments on edge.edx.org without
+        # further work to make them robust, maintainable, finalize data formats,
+        # etc. 
+        'concept', # Concept mapper. See https://github.com/pmitros/ConceptXBlock
+        'done', # Lets students mark things as done. See https://github.com/pmitros/DoneXBlock
+        'audio', # Embed an audio file. See https://github.com/pmitros/AudioXBlock
         'openassessment',  # edx-ora2
     ] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES
 

requirements/edx/edx-private.txt

@@ -2,3 +2,10 @@
 
 -e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@9fcd333aaa2ac3df65dd247b601ce0b56bb10cad#egg=edx-jsdraw
 -e git+https://github.com/gsehub/xblock-mentoring.git@b779446e9f51b9a1576d514cc14166907316a106#egg=xblock-mentoring
+
+# Prototype XBlocks from edX learning sciences limited roll-outs and user testing. 
+# Concept XBlock, in particular, is nowhere near finished and an early prototype. 
+
+-e git+https://github.com/pmitros/ConceptXBlock.git@2376fde9ebdd83684b78dde77ef96361c3bd1aa0#egg=concept-xblock
+-e git+https://github.com/pmitros/DoneXBlock.git@604a79dc7ed3fc7894feb8884e168cd21266b594#egg=done-xblock
+-e git+https://github.com/pmitros/AudioXBlock.git@1fbf19cc21613aead62799469e1593adb037fdd9#egg=audio-xblock

requirements/edx/github.txt

@@ -29,6 +29,3 @@
 -e git+https://github.com/edx/edx-ora2.git@release-2014-06-02T15.45#egg=edx-ora2
 -e git+https://github.com/edx/opaque-keys.git@91b7ec93cfb57c6739332e85805296626b4fb1db#egg=opaque-keys
 git+https://github.com/edx/ease.git@a990b25ed4238acb1b15ee6f027465db3a10960e#egg=ease
-
-# Prototype XBlocks for limited roll-outs and user testing. These are not for general use.
--e git+https://github.com/pmitros/ConceptXBlock.git@2376fde9ebdd83684b78dde77ef96361c3bd1aa0#egg=concept-xblock