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

5229 Commits

Author SHA1 Message Date
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako 
mitxmako => edxmako
 2013-12-03 11:36:50 -08:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Ned Batchelder
599bdbb102 Show full diffs in ResponseType tests. 2013-12-03 14:05:33 -05:00
polesye
e0f2ece2f2 Merge pull request #1820 from edx/anton/fix-lti-display-name 
LTI: Add display name.
 2013-12-03 09:36:30 -08:00
polesye
41d82dfcc1 BLD-542: Add display name. 2013-12-03 17:21:04 +02:00
polesye
78149d0ae4 Add comment. 2013-12-03 09:08:44 +02:00
polesye
8f01387178 BLD-525: Fix Numerical input to support mathematical operations. 2013-12-02 17:47:20 +02:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
 2013-11-26 16:30:55 -05:00
Calen Pennington
9b6edea406 Rename the LTIModuleDescriptor to LTIDescriptor to follow convention 2013-11-26 16:29:34 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00
zubair-arbi
18f342c076 Merge pull request #1781 from zubair-arbi/zub/bugfix/std979-displaynameclashes 
Fix unique vertical url + add test
 2013-11-26 06:26:57 -08:00
Zubair Afzal
829cd7d861 Fix unique vertical url + add test 
STUD-979
 2013-11-26 14:30:17 +05:00
Ned Batchelder
368c5758a5 Fix CHANGELOG conflicts again. 2013-11-25 15:01:26 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Will Daly
bf94083d2c Revert PR 1711; disabling JS tests again 2013-11-25 14:50:40 -05:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Valera Rozuvan
ace8df3916 Turned back on several Video Jasmine tests. 
BLD-463
 2013-11-25 20:22:53 +02:00
Calen Pennington
329419696e Merge pull request #1746 from cpennington/fix-lms-1532 
Fix LMS-1532 (partially instantiated XModules after an exception)
 2013-11-22 10:01:43 -08:00
polesye
90bbb7b1cd Merge pull request #1706 from edx/anton/code-response-improvements 
Code response improvements.
 2013-11-22 09:46:58 -08:00
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
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
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
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
polesye
83c5e8b8bf BLD-126: Code response improvements. 2013-11-22 16:15:11 +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
Don Mitchell
3ab17d7523 Allow colons in Locator fields. 2013-11-21 10:41:49 -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
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
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
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier 
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
 2013-11-20 10:15:09 -05:00
Calen Pennington
6c9ad30ee1 Update open-ended tests to load the module between 'requests' 
Under normal operation, XModules are reloaded on each request from a
student. CombinedOpenEnded modules have code that runs at initialization
that validates the students state. These changes makes that code run
during several long-form unit tests (testing CombinedOpenEnded across
multiple 'requests').

These tests are marked as expectedFailure because they now exhibit the
same failures as observed in [LMS-1493] (namely, the students state gets
reset, because CombinedOpenEnded interprets system.ajax_url raising an
error as meaning that the problem definition and the student answers are
in conflict)
 2013-11-20 10:15:09 -05:00
Don Mitchell
cb113deade Separate all db ops from modulestore ops 2013-11-19 17:31:10 -05:00
Giulio Gratta
745f45090f Merge pull request #1702 from edx/giulio/anon-user-id-yml 
Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.
 2013-11-19 11:29:26 -08:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children 
The forcing of IDs to non-draft must happen in base.py instead of draft....
 2013-11-19 11:18:54 -08:00
RobertMarks
e3b8ce708f changes to allow multiple choicetextresponses in one problem 2013-11-19 09:55:35 -08:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py. 
The draft.py solution only worked when the parent was also in the draft store.
 2013-11-19 12:08:29 -05:00