Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
3c042b52fd Clear out the cache xmodule_instance after an exception in XModule init 
This guarantees that the ErrorModule will be created, instead of
potentially using a partially instatiated broken module. Fixes
[LMS-1532].
 2013-11-22 12:08:29 -05:00
Calen Pennington
8d62fa14d8 Tests for LMS-1532 2013-11-22 12:08:29 -05:00
Adam Palay
cf524906e0 more granular transactions in grading [LMS-1480] 
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
 2013-11-22 12:02:35 -05:00
Ned Batchelder
3efcc3d6ef Merge pull request #1753 from edx/ned/pr-1745-lms-1492 
Ned/pr 1745 lms 1492
 2013-11-22 08:50:08 -08:00
Ned Batchelder
75532987ce Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:47:34 -05:00
Ned Batchelder
1c27ec3d7e Add two tests of problems-with-files 
One test passes already, the other fails.  Fix in next commit.
 2013-11-22 11:47:33 -05:00
Ned Batchelder
6d94b71203 Clean up test files, no substantive changes. 
These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.
 2013-11-22 11:47:33 -05:00
Ned Batchelder
938bd6b4e7 Merge pull request #1745 from edx/ned/lms-1492 
LMS-1492: Convert between webob's cgi.FieldStorage uploaded files to pure file objects.
 2013-11-22 08:42:14 -08:00
Diana Huang
586b1f72ef Fix typo in comment. 2013-11-22 11:27:18 -05:00
Don Mitchell
7ab31f5478 Merge pull request #1710 from edx/dhm/restful_settings 
Restful course settings
 2013-11-22 08:23:12 -08:00
Diana Huang
8d564f219d Use Choices to track possible modes. 2013-11-22 11:22:49 -05:00
Ned Batchelder
de7d2cd08c Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:09:11 -05:00
Ned Batchelder
4ace4f98cc Add two tests of problems-with-files 
One test passes already, the other fails.  Fix in next commit.
 2013-11-22 11:09:11 -05:00
Greg Price
7e074f1a7e Add error recovery to inline discussion loading 
Now the interface will reset apropriately and allow a user to retry
expanding the discussion or loading a new page, and the alert message
will ask the user to retry.

JIRA: FOR-300, FOR-301
 2013-11-22 11:00:10 -05:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
David Ormsbee
901ad22652 Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev. 
Having ENABLE_S3_GRADE_DOWNLOADS enabled by default in common.py
could lead to surprising behavior for folks downstream. They'd
suddenly see a grade download screen on their new instructor
dashboard, but the links by default would be local files and
couldn't be used in an actual production environment. So we disable
by default and let people explicitly enable it and set it up for
S3 if they wish.

LMS-58
 2013-11-22 10:06:34 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output 
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
 2013-11-22 10:06:28 -05:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash 
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
 2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard. 
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
 2013-11-22 10:06:10 -05:00
polesye
83c5e8b8bf BLD-126: Code response improvements. 2013-11-22 16:15:11 +02:00
polesye
7e508248ed Merge pull request #1738 from edx/anton/update-calculator-hints 
Update the calculator hints tooltip with full information.
 2013-11-22 05:36:09 -08:00
polesye
b7438bc9a4 BLD-400: Update the calculator hints tooltip. 2013-11-22 12:18:52 +02:00
puntxo
7606810c30 Update course_navigation.html 
The tab names are not being translated
 2013-11-22 10:10:06 +01:00
polesye
51fa7e0c3b Merge pull request #1739 from edx/alex/fix-transcripts-500-error 
Fix 500 error in transcripts.
 2013-11-22 00:40:35 -08:00
Александр
3bbc7430f2 BLD-530: Fix 500 error in transcripts. 2013-11-22 10:06:03 +02:00
Ned Batchelder
d1f511e14b Clean up test files, no substantive changes. 
These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.
 2013-11-21 21:06:18 -05:00
Jason Bau
835893c2ed Merge pull request #1736 from edx/jbau/fix/cw-migrations 
Fix 0010 courseware migration
 2013-11-21 13:54:09 -08:00
Ned Batchelder
8d01a36e54 Merge pull request #1742 from edx/ned/cherry-pick-pr-1740 
Ned/cherry pick pr 1740
 2013-11-21 07:44:57 -08:00
Don Mitchell
3ab17d7523 Allow colons in Locator fields. 2013-11-21 10:41:49 -05:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new 
Convert tabs to use RESTful API
 2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL. 
STUD-850
 2013-11-21 10:19:43 -05:00
polesye
7bab863c22 Merge pull request #1698 from edx/anton/multiple-answers-string-response 
Allow multiple answers for string response.
 2013-11-21 07:14:29 -08:00
Christina Roberts
99cf0ec54a Merge pull request #1727 from edx/christina/public 
Minor cleanup around public RESTful URLs.
 2013-11-21 06:57:24 -08:00
Don Mitchell
e150207232 Merge pull request #1740 from edx/bug/locator_parse 
Allow colons in Locator fields.
 2013-11-21 06:40:52 -08:00
polesye
77c208a1cf BLD-474: Allow multiple answers for string response. 2013-11-21 16:23:33 +02:00
Don Mitchell
e8beb4d19b Allow colons in Locator fields. 2013-11-21 08:41:26 -05:00
Brian Talbot
d526027da0 Merge pull request #1721 from edx/talbs/update-gitignore 
Static CSS and Developer Stack Remnants to .gitignore
 2013-11-21 05:30:30 -08:00
zubair-arbi
df97df6fde Merge pull request #1606 from zubair-arbi/zub/bugfix/std293-coursehandout 
Show error on invalid html in course handout edit
 2013-11-21 01:53:08 -08:00
Valera Rozuvan
005e313f1c Merge pull request #1677 from edx/valera/alert_screenreader_video_end 
a11y - Videos need to alert screenreaders when the video is over.
 2013-11-21 00:47:31 -08:00
Valera Rozuvan
6910ac9535 Addressing reviewer's comments. 
Updated Change Log.

BLD-488
 2013-11-21 10:07:18 +02:00
Valera Rozuvan
752851744c Adding tests. 
Disabled Jasmine test due to flakiness on dev machine.
Added test for endTime in update().
Enabled updatePlayTime() tests. Will see on Jenkins.
Adding test for updatePlayTime() method.
Adding ProgressSlider notifyThroughHandleEnd() Jasmine tests.
Fixing Jasmine coverage problems.
Removed cover logs.
Fixing flaky test.
Removed code coverage logs.

BLD-488
 2013-11-21 10:06:39 +02:00
Valera Rozuvan
062c3b45a2 Initial commit. 
Adding focus on slider handle when video ends.
Removing unnecessary debug console.log() calls.
Change back to original code.
Adding comments.
Also undid tabindex=-1 for the slider knob. It is unnecessary, and prevents
the user from tabbing onto the slider.
Adding minor details.
startTime and endTime proper reset.

BLD-488
 2013-11-21 10:06:39 +02:00
Valera Rozuvan
f0bbd34ad6 Merge pull request #1715 from robertjmarks/master 
changes to allow multiple choicetextresponses in one problem

@adampalay will do!
 2013-11-20 21:39:21 -08:00
Jason Bau
f0874d41c4 Fix 0010 courseware migration 2013-11-20 20:39:40 -08:00
Diana Huang
696f1df043 Pass through the certificate mode correctly. 2013-11-20 17:05:57 -05:00
Calen Pennington
fdf7ea2cc0 Merge pull request #1726 from cpennington/hotfix-fix-OEE-ajax-url 
Fix LMS-1493
 2013-11-20 13:20:45 -08:00
David Baumgold
2b3d6b239c Merge pull request #1730 from edx/db/remove-backbone-sourcemap-comment 
Removed Backbone sourcemap comment
 2013-11-20 13:18:58 -08:00
David Baumgold
e4817f5b4e Removed Backbone sourcemap comment 
Because the resulting 404 was causing confusion
 2013-11-20 15:55:31 -05:00
Adam
92238d7f7b Merge pull request #1729 from edx/adam/more-granular-grading-transactions-2 
more granular transactions in grading [LMS-1480]
 2013-11-20 12:09:49 -08:00
polesye
538be891bc Merge pull request #1725 from edx/anton/transcripts-fix-acceptance-test 
BLD-524: Add missing assert in video test.
 2013-11-20 11:44:15 -08:00