Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

7928 Commits

Author SHA1 Message Date
Don Mitchell
7a4204b72a SplitMongo publish method 
STUD-451
 2013-12-05 16:15:19 -05:00
Adam
f7d86bfff5 Merge pull request #1814 from edx/adam/fix-ora-typo 
fix typo in ORA template (ORA-136)
 2013-12-05 07:37:52 -08:00
Alexander Kryklia
bceadd4830 Merge pull request #1819 from edx/anton/fix-lti-scores 
Fix LTI max_score method.
 2013-12-05 02:40:19 -08:00
Александр
e96108629d Fix LTI tests. 2013-12-04 15:55:47 -05:00
Александр
c4515faedf Make has_score to be XField insted of decriptor property. 
Conflicts:
	common/lib/xmodule/xmodule/lti_module.py
 2013-12-04 15:55:42 -05:00
polesye
e4403815e7 Fix LTI max_score method. 2013-12-04 15:54:51 -05:00
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -05:00
Zubair Afzal
050031f7d5 Disable Peer Track Changes 
STUD-1008
 2013-12-04 11:21:38 -05:00
zubair-arbi
5347923304 Merge pull request #1829 from zubair-arbi/zub/bugfix/std1008-disablepeertrackchanges 
Disable Peer Track Changes
 2013-12-04 08:04:33 -08:00
Zubair Afzal
5dba3fb47a Disable Peer Track Changes 
STUD-1008
 2013-12-04 16:43:17 +05:00
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
Adam Palay
c812c5509a fix typo in ORA template (ORA-136) 2013-12-03 14:35:20 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -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
Александр
1cd9325ef5 Fix LTI tests. 2013-12-03 19:04:21 +02:00
Александр
932d13ede8 Make has_score to be XField insted of decriptor property. 2013-12-03 17:48:27 +02:00
polesye
41d82dfcc1 BLD-542: Add display name. 2013-12-03 17:21:04 +02:00
polesye
2088a2159e Add min value. 2013-12-03 13:41:51 +02:00
polesye
8a180744ed Fix LTI max_score method. 2013-12-03 12:50:16 +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