Merge pull request #2299 from lduarte1991/master

Text and Video Annotation Modules - First Iteration

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -146,6 +146,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
         # response HTML
         self.check_components_on_page(ADVANCED_COMPONENT_TYPES, ['Word cloud',
                                                                  'Annotation',
+                                                                 'Text Annotation',
+                                                                 'Video Annotation',
                                                                  'Open Response Assessment',
                                                                  'Peer Grading Interface'])
 

cms/djangoapps/contentstore/views/component.py

@@ -52,6 +52,8 @@ else:
 
     ADVANCED_COMPONENT_TYPES = [
         'annotatable',
+        'textannotation',  # module for annotating text (with annotation table)
+        'videoannotation',  # module for annotating video (with annotation table)
         'word_cloud',
         'graphical_slider_tool',
         'lti',