Jay Zoldak
2e85ba1a27
Omit migrations from code coverage reports.
...
Also omit portal and terrain, which are used for the lettuce testing framework.
2013-02-19 10:54:02 -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
Christina Roberts
a62a575a33
Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding
...
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
2013-02-19 06:34:32 -08:00
Don Mitchell
cfa13922f5
Change url for login from login to signin.
2013-02-15 17:30:24 -05:00
Diana Huang
3e23b9e1f2
Merge pull request #1480 from MITx/diana/staff-grading-flagging
...
Flag submissions from staff grading view
2013-02-15 13:08:16 -08:00
cahrens
5acf9cb3d2
Reformat to 4 spaces.
2013-02-15 14:46:41 -05:00
cahrens
2486ebc22a
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
2013-02-15 14:45:20 -05:00
Brian Talbot
86d9f0b65c
resolving local merge
2013-02-15 14:15:51 -05:00
cahrens
37e4cd81b1
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
2013-02-15 14:15:03 -05:00
Brian Talbot
93949ab342
resolving local merge problem
2013-02-15 14:12:46 -05:00
Brian Talbot
a5e2b5c53a
resolving merge conflict and missing Sass mixin
2013-02-15 14:10:52 -05:00
Jay Zoldak
34a4b35e66
Fix lettuce acceptance tests to reflect the new soft landing page changes.
2013-02-15 14:07:46 -05:00
cahrens
b49325009a
Merge branch 'master' into feature/btalbot/studio-softlanding
2013-02-15 13:14:46 -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
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
Brian Talbot
6c95460761
studio - resolving merge from master
2013-02-15 09:15:06 -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
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
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
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
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
