Jay Zoldak
2bde448fbb
Change coverage report config to reflect refactoring of terrain files
2013-02-20 09:53:12 -05:00
Jay Zoldak
67c2bac68f
Pep8fix lettuce test code
2013-02-20 09:53:02 -05:00
Jay Zoldak
562fb67671
Remove portal (fake) app, move tests to courseware.
...
Comment out tests that don't run correctly without prerequisites.
2013-02-20 09:52:51 -05:00
Jay Zoldak
7495bd0ae4
Move terrain module from lms to common.
2013-02-20 09:52:32 -05:00
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
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
Jay Zoldak
34a4b35e66
Fix lettuce acceptance tests to reflect the new soft landing page changes.
2013-02-15 14:07:46 -05: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
723012b2bb
Better logging, and make view csrf exempt...
2013-02-14 14:50:18 -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
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
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
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
Vasyl Nakvasiuk
8cf8dcd10b
rm videoalpha_list method
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
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
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
Valera Rozuvan
7c7e09500a
Renamed videox to videoalpha, as per Piotr naming scheme request.
2013-02-14 11:22:12 +02:00
Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Vik Paruchuri
9e5eca1417
Swap b tag for span
2013-02-13 11:29:18 -05:00
Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
David Ormsbee
e07b667c02
Merge pull request #1488 from MITx/bug/btalbot/pearson-ie
...
Resolving an LMS sidebar accordion issue in IE7
2013-02-12 08:01:59 -08:00
Brian Talbot
f33f7134fb
lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters
2013-02-12 10:34:21 -05:00
Brian Talbot
83e4dfaacb
lms - pearson: trying to resolve JQUI accordion width bug in IE7
2013-02-12 09:58:16 -05:00
Diana Huang
285e575895
Update copy to be clearer about the workflow.
2013-02-11 17:29:45 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
David Ormsbee
75ff2bd6cb
Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
...
Fix/cdodge/dangling discussion modules
2013-02-11 11:40:00 -08:00
Vik Paruchuri
58a2186e71
Increase padding a bit
2013-02-11 11:33:44 -05:00
Vik Paruchuri
4e071d086f
Fix staff grading ML error info a bit
2013-02-11 11:31:26 -05:00
Vik Paruchuri
920acffd2c
Resize student submission box
2013-02-11 11:13:34 -05:00
Vik Paruchuri
838d948c15
Fix padding and border on staff and peer grading panels
2013-02-11 11:07:20 -05:00
Diana Huang
d3d3a03c61
Add checkbox and make sure to uncheck it after submission
2013-02-11 09:23:55 -05:00
Diana Huang
f3bb429915
Get and pass the new submission flagged information through
...
the controller to the backend.
2013-02-11 09:23:55 -05:00
David Ormsbee
754493597d
Merge pull request #1469 from MITx/feature/ichuang/fix-verbose-staff-debug
...
Fix "staff debug" so it only appears where useful, instead of everywhere
2013-02-10 22:10:53 -08: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
d7c60231f0
Fix template icon
2013-02-09 15:13:55 -05:00
Vik Paruchuri
21cca5fb97
Add missing tag
2013-02-09 11:14:12 -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
46da4cf241
Add in a better notification icon
2013-02-09 10:15:11 -05:00
