Brian Talbot
20553b00d3
resolving merge conflict with master
2013-02-15 09:32:38 -05: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
Brian Talbot
9feb810006
studio - final prep of introduction areas (with fix for current page content margins)
2013-02-14 13:16:10 -05:00
Brian Talbot
bd98b2726a
resolving local merge conflict
2013-02-14 13:00:51 -05:00
Brian Talbot
c81f958788
studio - final prep of introduction areas (with fix for current page content margins)
2013-02-14 13:00:14 -05:00
Brian Talbot
9b09d043bd
studio - adding introduction areas to all templates and infrastructure for its contnet
2013-02-14 12:49: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
Mark L. Chang
859cfff870
updated modal copy and alt text
2013-02-14 12:42:17 -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
Brian Talbot
47c117bf03
studio - page headers: resolved new course update creation JS issue caused by new markup
2013-02-14 10:52:25 -05: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
Brian Talbot
1a1be106ae
studio - page headers: added in view live links to course dashboard
2013-02-14 10:14:10 -05:00
Brian Talbot
2024f9eeca
studio - page headers: added view course button to course outline
2013-02-14 09:48:19 -05:00
Brian Talbot
6ade6983ae
studio - page headers: added in logic to style page actions' height based on title having a subtitle or not
2013-02-14 09:38:32 -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
Brian Talbot
41dc655cce
resolving local merge conflict
2013-02-14 09:03:46 -05:00
Brian Talbot
54cc51bccf
studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature
2013-02-14 09:02:51 -05:00
Brian Talbot
557beea31f
studio - hiding mast area for subsections
2013-02-14 09:00:57 -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
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
