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

10279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
dceb8fee5e Merge pull request #1494 from MITx/feature/marco/addcomponent 
Feature/marco/addcomponent
 2013-02-15 10:13:24 -08:00
Don Mitchell
c4586edb2e Change hardcoded template names to the newer hardcoded template names 
:-(
 2013-02-15 12:03:04 -05:00
Carlos Andrés Rocha
86865a6823 Merge pull request #1507 from MITx/bugfix/valera/video_alpha 
Bugfix/valera/video alpha
 2013-02-15 08:22:25 -08:00
Valera Rozuvan
c7679ea624 Removed debugging comments. 2013-02-15 18:12:53 +02:00
Valera Rozuvan
a0f46dae49 Fixed bug that prevented Firefox from playing HTML5 video content. 2013-02-15 18:10:14 +02:00
Don Mitchell
bfcc0559a7 Merge pull request #1503 from MITx/fix/cdodge/export-policy-json 
add exporting of policy.json
 2013-02-14 12:47:37 -08:00
Victor Shnayder
cc7a97082a Merge pull request #1468 from MITx/feature/ichuang/fix-module-staff-access-v2 
fix module staff accesss - by has_access, not by user.is_staff
 2013-02-14 12:08:56 -08:00
Victor Shnayder
cb37bf7326 Merge pull request #1504 from MITx/feature/victor/foldit-api 
Better logging, and make view csrf exempt...
 2013-02-14 12:05:04 -08:00
Victor Shnayder
723012b2bb Better logging, and make view csrf exempt... 2013-02-14 14:50:18 -05:00
Chris Dodge
ea068d4aa8 add exporting of policy.json 2013-02-14 14:19:38 -05:00
Victor Shnayder
2388770c25 Merge pull request #1502 from MITx/feature/victor/foldit-api 
Feature/victor/foldit api
 2013-02-14 10:36:12 -08:00
Victor Shnayder
1108137dc3 Address Cale's comment--make property a simple class var 2013-02-14 13:24:21 -05:00
Victor Shnayder
d7f9bdda66 Move foldit app into the lms. No need for it in the cms, and it was breaking tests there.. 2013-02-14 13:23:58 -05:00
Victor Shnayder
4f8757600a merge 2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596 Foldit integration. 
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
 2013-02-14 12:45:06 -05:00
Victor Shnayder
fffbb55944 Make hidden_module not cause 500 errors by adding a get_html() 2013-02-14 12:45:01 -05:00
Victor Shnayder
21dab27ed6 fix logger name in module_render 2013-02-14 12:45:01 -05:00
Ned Batchelder
f9664284c5 Merge pull request #1501 from MITx/feature/ned/fix-firefox-gradient-buttons 
Firefox doesn't draw the buttons right with -90deg, but will draw it rig...
 2013-02-14 08:41:41 -08:00
Carlos Andrés Rocha
1f61f6ce08 Merge pull request #1409 from MITx/feature/valera/video_alpha 
Feature/valera/video alpha
 2013-02-14 08:08:57 -08:00
Ned Batchelder
d614c80cc2 Firefox doesn't draw the buttons right with -90deg, but will draw it right if no direction is specified. 2013-02-14 10:39:16 -05:00
Victor Shnayder
5134c99d97 Merge pull request #1500 from MITx/700x-sandbox 
700x sandbox
 2013-02-14 06:20:02 -08:00
Victor Shnayder
e352226df5 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-14 09:19:25 -05:00
Victor Shnayder
f80181be9a Merge pull request #1499 from MITx/feature/ichuang/codeinput-rows-fix 
allow "rows" attrib of coderesponse textbox to set box height
 2013-02-14 06:16:29 -08:00
Vasyl Nakvasiuk
237e6ff6a8 merge 2013-02-14 11:33:04 +02:00
Vasyl Nakvasiuk
93000af79d fix problem with mutable default value in VideoAlphaModule._get_source 2013-02-14 11:30:21 +02:00
Valera Rozuvan
d55b818bb2 Updated YouTube JS API file to the new one. 2013-02-14 11:25:36 +02:00
Valera Rozuvan
92dc8859a3 YouTube HTML5 mode is used by default. Fix typo in video alpha template. 2013-02-14 11:22:14 +02:00
Valera Rozuvan
1254e11836 Fixes and additions. Addressing comments by Carlos for pull request 1409. 2013-02-14 11:22:14 +02:00
Vasyl Nakvasiuk
b69b88a718 some small fix 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
b229abd396 add xml exmaple for videoalpja module in docstring 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
8cf8dcd10b rm videoalpha_list method 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
0b73f0a59d remove unnecessary code 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
de94855ba0 use one general dictionary self.sources for videoalpha_module 2013-02-14 11:22:13 +02:00
Valera Rozuvan
7d851b9f5d Fixed bug when switching speeds in YouTube HTML5 player. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
e59994a4b8 Finalized HTML5 YouTube player inbrowser speed changes. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
b2bffb010e Work on adding native spped change for YouTube HTML5. Not complete. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
eff8ad6762 Fixed bug with HTML5 start end options. Now can specify an interval of video which must be played. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
b5bd7a697f Added start and end time support. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
5129be978f Fixed bugs. Removed unnecessary things from HTML5. Minor improvements. Subtitles now work in HTML5 if specified. 2013-02-14 11:22:13 +02:00
Valera Rozuvan
e737522bb7 Fixed bug with jumpy timeline when switching speeds. Enabled show_captions option. Added JS support for subtitles in HTML5 mode. 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
a2d9df9d34 add "sub" to <video> tag in xml lessons 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
d72036a6dc add support sub attribute for <video> tag 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
3ac9d54ff7 fix wemb -> webm 2013-02-14 11:22:13 +02:00
Vasyl Nakvasiuk
5cce568836 add docstrings in videoalpha_module.py 2013-02-14 11:22:13 +02:00
Valera Rozuvan
4f08d96cfd Added ability to change playback rate, added pause/play on video click, minor improvements. 2013-02-14 11:22:12 +02:00
Valera Rozuvan
80fa9d0116 Added support for time line in HTML5. 2013-02-14 11:22:12 +02:00
Valera Rozuvan
067f2e97f5 Enabled play/pause buttons for HTML5 video player. 2013-02-14 11:22:12 +02:00
Vasyl Nakvasiuk
786c11484e <videoalpha> tag now support multi-source 2013-02-14 11:22:12 +02:00
Valera Rozuvan
ed00d20708 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-14 11:22:12 +02:00
Valera Rozuvan
ca83c3953a Adding HTML5Video class and modifying coffee sources to use it when video sources are provided instead of YouTube IDs. 2013-02-14 11:22:12 +02:00