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
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
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
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
David Ormsbee
80843c1561
Merge pull request #1463 from MITx/feature/brian/pearson-exam
...
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Victor Shnayder
a68094515c
fix capitalization and spacing
2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6
fix typo; fix phrasing for software engineer job
2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885
Posting lots of new jobs
2013-02-08 12:15:09 -05:00
ichuang
96d119965c
limit staff debug verbosity to locations of specific categories
2013-02-08 10:52:03 -05:00
ichuang
04cc257bdd
fix module staff accesss - by has_access, not by user.is_staff
2013-02-08 10:46:17 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3
Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam
2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00
David Ormsbee
b947b88453
Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain
...
remove CSRF cookie domain setting in aws.py
2013-02-07 08:17:34 -08:00
Chris Dodge
0394e33652
remove CSRF cookie domain setting in aws.py
2013-02-07 11:15:23 -05:00
Chris Dodge
faf7c64ea5
add try/catch and fallback to returning a path to the root of the course
2013-02-07 10:32:13 -05:00
ichuang
bf17341fdb
add select_related("profile")
2013-02-06 23:16:44 -05:00
David Ormsbee
a6b35853f9
Merge pull request #1455 from MITx/hotfix/dave/youtube_object
...
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 19:47:25 -08:00
David Ormsbee
976776643b
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 22:46:22 -05:00
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
