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

2631 Commits

Author SHA1 Message Date
Diana Huang
789db30176 Merge pull request #1520 from MITx/feature/vik/disable-spell-check 
Feature/vik/disable spell check
 2013-02-20 09:45:32 -08:00
Vik Paruchuri
c48998b30a Fix SA tests 2013-02-20 11:57:29 -05:00
Vik Paruchuri
7be76fe124 Fix tests 2013-02-20 11:54:57 -05:00
Vik Paruchuri
ee3c658f46 Merge remote-tracking branch 'origin/master' into feature/vik/disable-spell-check 2013-02-20 11:39:39 -05:00
Diana Huang
eefe87494d Merge branch 'feature/diana/close-oe-problems' of github.com:MITx/mitx into feature/diana/close-oe-problems 2013-02-20 11:23:28 -05:00
Diana Huang
d0bd7466b4 Fix import statement for TimeInfo 2013-02-20 11:22:58 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-20 11:20:10 -05:00
Vik Paruchuri
2b01ecc1af Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 15:21:47 -05:00
Christina Roberts
94a28f600b Merge pull request #1510 from MITx/bug/btalbot/html-strongspan 
xmodule scss - resolved studio bug #191
 2013-02-19 09:09:47 -08:00
VikParuchuri
0db6247d96 Merge pull request #1513 from MITx/feature/vik/improve-oe-ui 
Skip self assessment test (fails due to need for querydict for getlist t...
 2013-02-19 08:15:42 -08:00
Vik Paruchuri
9ee956a397 Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful) 2013-02-19 11:05:43 -05:00
Vik Paruchuri
4d57f1b9ee Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule 2013-02-19 10:43:55 -05:00
Diana Huang
f4addddf42 Merge pull request #1484 from MITx/feature/vik/improve-oe-ui 
Feature/vik/improve oe ui
 2013-02-19 07:27:29 -08:00
Brian Talbot
6d2ada5084 xmodule scss - resolved some general span styling that would override basic em or strong type styling 2013-02-19 09:59:36 -05:00
Christina Roberts
dceb8fee5e Merge pull request #1494 from MITx/feature/marco/addcomponent 
Feature/marco/addcomponent
 2013-02-15 10:13:24 -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
Chris Dodge
ea068d4aa8 add exporting of policy.json 2013-02-14 14:19:38 -05:00
Victor Shnayder
1108137dc3 Address Cale's comment--make property a simple class var 2013-02-14 13:24:21 -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
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
Victor Shnayder
e352226df5 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-14 09:19:25 -05: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
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