Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Valera Rozuvan
143217d6b6 Work on adding native spped change for YouTube HTML5. Not complete. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
bfda8bec89 Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
6729eae90c Added start and end time support. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
0216a0fd35 Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
83f18fed28 Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode. 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
0ff68979ea add "sub" to <video> tag in xml lessons 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
219b8e8d45 add support sub attribute for <video> tag 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
c0d024df8e fix wemb -> webm 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
1d08e22718 add docstrings in videoalpha_module.py 2013-02-13 10:27:56 +02:00
Valera Rozuvan
12eda46238 Added ability to change playback rate, added pause/play on video click, minor improvements. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
e37b62e4d3 Added support for time line in HTML5. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
dc267e894f Enabled play/pause buttons for HTML5 video player. 2013-02-13 10:27:56 +02:00
Vasyl Nakvasiuk
4163bb7b06 <videoalpha> tag now support multi-source 2013-02-13 10:27:56 +02:00
Valera Rozuvan
adf0c75d51 Updated all coffee scripts to define and use Alpha version of classes. Added missing functions for HTML5Video.Player prototype. Now bare bones works without errors. YouTube version also works without errors. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
78e9692aaa Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs. 2013-02-13 10:27:56 +02:00
Valera Rozuvan
156da20c35 Renamed videox to videoalpha, as per Piotr naming scheme request. 2013-02-13 10:27:55 +02:00
Arthur Barrett
949603e3c1 Fixed issue with return link and scroll after effects. 2013-02-13 01:16:20 -05:00
Arthur Barrett
6b5bf319c3 Style and behavior changes. Added return links to discussions. 2013-02-12 19:08:23 -05:00
Carlos Andrés Rocha
dff0c10b7a Merge pull request #1493 from MITx/bug/dhm/misc 
Fix broken test and don't pass time units as strings but as ints.
 2013-02-12 15:14:37 -08:00
Brian Talbot
fccb3d7a73 studio - nav and soft landing various QA fixes 2013-02-12 17:36:36 -05:00
Don Mitchell
c904174bb7 Fix broken test and don't pass time units as strings but as ints. 2013-02-12 17:30:57 -05:00
Julian Arni
9785bc9e70 Adding multiple-choice loncapa integration. 2013-02-12 17:21:34 -05:00
Brian Talbot
0a2b74110e studio - nav and soft landing various QA fixes 2013-02-12 17:03:48 -05:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
jkarni
2197bd987f Merge pull request #1461 from MITx/feature/julian/multiple-choice-tweaks 
Feature/julian/multiple choice tweaks
 2013-02-12 13:32:15 -08:00
chrisndodge
af364166fe Merge pull request #1491 from MITx/bug/dhm/misc 
lms required grace period fields to be in specific order
 2013-02-12 12:42:53 -08:00
Vik Paruchuri
b40a035ff7 Update error message 2013-02-12 15:32:57 -05:00
Vik Paruchuri
5cf7441da1 Fix error message passing to JS and student 2013-02-12 15:31:30 -05:00
cahrens
f56729dbdb Turn off line wrapping. 2013-02-12 15:27:38 -05:00
Vik Paruchuri
53028b46c3 Remove debug statements 2013-02-12 15:23:11 -05:00
Don Mitchell
76d675ba16 fix npe for time (bug 185) 2013-02-12 15:20:02 -05:00
Brian Talbot
dd50313f82 studio - revised manual policy editor scss to have value field height match key values' and condensed error message UI 2013-02-12 15:19:08 -05:00
Don Mitchell
40668133f7 Fix bug which I know I fixed before (perhaps on another branch?) to 
ensure old time had a value before comparing it to new time.
 2013-02-12 15:11:35 -05:00
Brian Talbot
70e11e823c studio - made all page heading chrome have consistent markup 2013-02-12 15:07:32 -05:00
Vik Paruchuri
74b1187a39 Remove log statements 2013-02-12 15:04:49 -05:00
Vik Paruchuri
1409f8aa6b Add in checking for score list length to rubric rendering 2013-02-12 15:03:03 -05:00
Vik Paruchuri
8d3f4932e7 Add in checks to see if student can submit (ie needs to peer grade more or not) 2013-02-12 14:41:36 -05:00
Vik Paruchuri
4237df625a Add in a check function to see if students are allowed to submit peer grading 2013-02-12 14:31:30 -05:00
Brian Talbot
540710f553 studio - nav revamp: added in dynamic course org and number to header 2013-02-12 14:22:42 -05:00
Arthur Barrett
0c70d201f8 Auto-expand the discussion thread after it is scrolled to by simulating a click on the show/hide button. Note: the jQuery highlight effect doesnt work here due to a CSS !important setting on .discussion-module background color. 2013-02-12 13:57:28 -05:00
Don Mitchell
8e213fb0d7 lms required grace period fields to be in specific order 2013-02-12 13:48:54 -05:00
Ned Batchelder
27e8d699be On 32-bit Python, this conversion could overflow, for example, for year 2099. This conversion won't. 2013-02-12 13:43:03 -05:00
Diana Huang
482d97d321 Better error messages for when a linked problem cannot be found 2013-02-12 13:41:26 -05:00
Vik Paruchuri
9ead4ebb35 Wire through ability to skip basic checks 2013-02-12 13:30:56 -05:00
Arthur Barrett
7e7911a08d Changed the markup and js for associating spans with discussion threads. Uses the discussion id now. 2013-02-12 13:24:50 -05:00
Brian Talbot
e5c0bdf7a1 studio - added in manual policy editor CodeMirror styles and removed unused classes on CodeMirror instance in other settings tabs 2013-02-12 13:13:37 -05:00
David Ormsbee
537d6dd18e Merge pull request #1490 from MITx/bugfix/brian/pearson-timer 
change timer to calculate relative duration in javascript
 2013-02-12 09:26:53 -08:00
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Don Mitchell
c9c026be62 Fixed urls 2013-02-12 12:15:07 -05:00
Arthur Barrett
45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-12 12:09:21 -05:00