Peter Fogg
782cb05410
Add passing Lettuce testing for video autoplay in LMS.
2013-05-31 11:22:45 -04:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
Peter Fogg
5465bda5f3
Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.
2013-05-29 17:00:25 -04:00
Peter Fogg
e0d5118ca0
Add hidden HTML so that the video player knows whether or not we're in the LMS.
2013-05-29 15:45:36 -04:00
Calen Pennington
4f555f6480
Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model
...
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/module_info_model.py
cms/djangoapps/contentstore/tests/factories.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_details.py
cms/djangoapps/models/settings/course_grading.py
cms/templates/edit_subsection.html
common/djangoapps/mitxmako/shortcuts.py
common/djangoapps/static_replace.py
common/djangoapps/util/converters.py
common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/abtest_module.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/discussion_module.py
common/lib/xmodule/xmodule/error_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/js/src/video/display.coffee
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/raw_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_export.py
common/lib/xmodule/xmodule/tests/test_import.py
common/lib/xmodule/xmodule/video_module.py
common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/templates/staff_problem_info.html
lms/templates/video.html
rakefile
2013-02-07 15:12:30 -05:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Jay Zoldak
56d17d8a8a
Improve some comments and names in the acceptance test framework
2013-01-02 10:44:21 -05:00
Jay Zoldak
af4f1668d7
Stub out the video and capture the html files of the high level tabs for diff comparison
...
Conflicts:
lms/templates/video.html
2013-01-02 10:44:20 -05:00
Calen Pennington
cbfc7b201a
WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms
2012-12-28 14:44:31 -05:00
Alexander Kryklia
97016d6168
video time frame support for xmodule
2012-12-05 17:18:35 +02:00
Chris Dodge
71f16d40e1
wire through course asset path information to the video playback module and corresponding .coffee files
2012-11-26 11:19:51 -05:00
Louis Sobel
b1cfee4592
Add support for subtitle download link
...
Add a download link to the video player. The link is defined
in the content xml using the following structure:
<video youtube="youtubestring">
<track kind="subtitle" src="subtitle_link" />
</video>
2012-10-23 14:50:17 -04:00
Carlos Andrés Rocha
f357e90dc0
Add support for video download link
...
Add a download link to the video player. The link is defined in the
content xml using the following structure:
<video youtube="youtubestring">
<source src="video_link"/>
</video>
2012-10-02 14:23:31 -04:00
Carlos Andrés Rocha
5ce16738fb
Reverting to original video player
2012-09-13 18:38:48 -04:00
Carlos A. Rocha
e0c7cef65f
Workaround for swfobject - pipeline problems
2012-09-13 01:38:52 -04:00
Arjun Singh
5c5d11409a
Temporary fix to make uncaptioned videos display reasonably. Will replace with proper solution.
2012-08-29 13:58:22 -07:00
Sarina Canelake
44cff00f50
Fix display titles on video pages
2012-08-28 12:20:36 -04:00
Victor Shnayder
b46172da9b
Rename module.name and descriptor.name to url_name
...
* update templates and code references
* also a display_name property that defaults to cleaned url_name
2012-08-03 11:36:54 -04:00
Calen Pennington
cb6c7640c8
Get the video module pointing to the correct static files directory, without relying on get_html replacement
2012-07-24 16:14:01 -04:00
Calen Pennington
3fa636e060
Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory
2012-07-24 16:13:59 -04:00
Calen Pennington
23195e9d76
Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken
2012-06-29 12:45:17 -04:00
Calen Pennington
5ba03130aa
Moving LMS code into subdirectory
2012-06-06 14:09:01 -04:00
