Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,532 Commits 1 Branch 0 Tags
8acbeec3add4e65149f2ccb9dbca44bbc4e4dfc0
Commit Graph

2595 Commits

Author SHA1 Message Date
Vik Paruchuri
8447eb5460 Remove extraneous debug messages 2013-02-13 11:40:07 -05:00
Vik Paruchuri
833aa01bd4 Add in documentation on tuple matching 2013-02-13 11:38:43 -05:00
Vik Paruchuri
382d4d70ea Minor parsing fix, remove b tag from selectors 2013-02-13 11:35:43 -05:00
Vik Paruchuri
9e5eca1417 Swap b tag for span 2013-02-13 11:29:18 -05:00
Valera Rozuvan
26094a0421 YouTube HTML5 mode is used by default. Fix typo in video alpha template. 2013-02-13 16:47:06 +02:00
Christina Roberts
0b91c1c346 Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates 
clean up templates that were removed from disk - we need to remove from ...
 2013-02-13 06:29:35 -08:00
Valera Rozuvan
a7b0dd67b7 Merge branch 'feature/valera/video_alpha' of github.com:MITx/mitx into feature/valera/video_alpha 2013-02-13 14:09:44 +02:00
Valera Rozuvan
6d5e230733 Fixes and additions. Addressing comments by Carlos for pull request 1409. 2013-02-13 14:09:35 +02:00
Vasyl Nakvasiuk
d0ac56ca56 some small fix 2013-02-13 13:35:34 +02:00
Vasyl Nakvasiuk
1f79877a9b add xml exmaple for videoalpja module in docstring 2013-02-13 13:35:10 +02:00
Vasyl Nakvasiuk
e6f1687362 rm videoalpha_list method 2013-02-13 13:28:09 +02:00
Vasyl Nakvasiuk
42b332abb4 remove unnecessary code 2013-02-13 13:11:59 +02:00
Vasyl Nakvasiuk
2a05fdd4d9 use one general dictionary self.sources for videoalpha_module 2013-02-13 11:48:06 +02:00
Valera Rozuvan
df31b3114b Fixed bug when switching speeds in YouTube HTML5 player. 2013-02-13 10:27:57 +02:00
Valera Rozuvan
baf6bbe34a Finalized HTML5 YouTube player inbrowser speed changes. 2013-02-13 10:27:57 +02:00
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
Julian Arni
9785bc9e70 Adding multiple-choice loncapa integration. 2013-02-12 17:21:34 -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
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
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Chris Dodge
93d186511f clean up templates that were removed from disk - we need to remove from DB as well 2013-02-12 10:23:32 -05:00
Vik Paruchuri
65cb53b8a6 Revert logsettings 2013-02-11 19:21:22 -05:00
Victor Shnayder
75898bfe1a tell collectstatic not to mess with protex--it relies on the filename 2013-02-11 17:54:54 -05:00
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy 
add exporting of grading_policy.json
 2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
Vik Paruchuri
2523c1e189 Slight visual tweaks 2013-02-09 12:40:11 -05:00
Vik Paruchuri
e68103f3e7 Render results at needed times 2013-02-09 11:24:29 -05:00
Vik Paruchuri
add3aa90e1 Fix peer grading interface transitions (reset feedback box, change message) 2013-02-09 11:01:34 -05:00
Vik Paruchuri
d6a2148bfb Clean up message and calibration page 2013-02-09 10:47:14 -05:00
Vik Paruchuri
50ba024ae8 Add additional calibration interstitial page, add in message when calibration essay saved. 2013-02-09 10:43:40 -05:00
Vik Paruchuri
67e364fa70 Fix spacing, slightly prune CSS 2013-02-09 09:13:21 -05:00
Vik Paruchuri
e8cb3590b1 Trim hint and submit messages out of self assessment 2013-02-09 09:06:14 -05:00
Vik Paruchuri
ae1df0108c Remove save successful message 2013-02-09 09:00:43 -05:00
Vik Paruchuri
6d0af13923 Fix respond to feedback 2013-02-09 08:46:24 -05:00