Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3831 from lduarte1991/lduarte-harvardx-image

Browse Source 
Installing Image Annotation Tool for Upcoming June 2014 Course
This commit is contained in:
Sarina Canelake
2014-05-23 15:40:39 -04:00
parent 94f050c418 e4e4b32c62
commit dd8d8fc5dd
53 changed files with 14676 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/contentstore/tests/test_contentstore.py
View File

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

1
cms/djangoapps/contentstore/views/component.py
View File

@@ -54,6 +54,7 @@ else:
'annotatable',
'textannotation', # module for annotating text (with annotation table)
'videoannotation', # module for annotating video (with annotation table)
'imageannotation', # module for annotating image (with annotation table)
'word_cloud',
'graphical_slider_tool',
'lti',