Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,542 Commits 1 Branch 0 Tags
3e87cb7c7d4a569fe2ae587bc428733ee61cd708
Commit Graph

8614 Commits

Author SHA1 Message Date
cahrens
df09e99ad1 Create explicit Locations. 
Part of STUD-1030
 2013-12-12 14:37:00 -05:00
Don Mitchell
f4e69275ee Use mongo indices for all queries 
STUD-1039
 2013-12-12 12:55:39 -05:00
Anton Stupak
5eb029293c Merge pull request #1917 from edx/anton/fix-imageresponse-in-ie 
Fix image mapping in IE
 2013-12-12 03:58:03 -08:00
Valera Rozuvan
d31268e790 Minor changes by Valera. 2013-12-11 17:27:23 +02:00
polesye
79519b7a07 Address comments. 2013-12-11 16:25:07 +02:00
polesye
418d6fa9e1 BLD-413: Add rounding of coordinates. 2013-12-11 15:20:05 +02:00
polesye
e5f583294a Address comments. 2013-12-11 13:28:34 +02:00
polesye
39e97225ff Fix tests. 2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f BLD-543: Fix bug with reordering in Studio. 2013-12-11 13:28:33 +02:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Waheed Ahmed
aba25c2de7 In OpenEndedModule latest_score and all_score calculate sum of rubric scores every time for ML grading. 
ORA-72
 2013-12-10 11:17:44 -05:00
Bertrand Marron
9d31a4ac4b Stop forcing video player’s speeds widget width 
When translating the “Speed” label using a longer word, the speeds
button gets really ugly.  The dropdown and the button will not always
have equal widths, but it’s better than having the text overlap the
other buttons.
 2013-12-10 12:00:48 +01:00
polesye
7196cf21ee BLD-479: Add additional example of DnD. 2013-12-09 22:04:45 +02:00
Valera Rozuvan
9072b9cc5d e-reader error when popping out window 
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.

BLD-465.
 2013-12-09 10:38:57 +02:00
Ned Batchelder
488923fd5c Add a test for Django-based file uploads to problems. 2013-12-07 19:53:23 -05:00
Don Mitchell
298e7a2343 Shorten collection name to keep index name w/in limit 2013-12-06 15:37:38 -05:00
Ned Batchelder
faa8f16fff Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed 
Update 12/3 RC branch with the part of the hotfix we want permanently.
 2013-12-06 07:49:46 -08:00
Don Mitchell
b5691cd4d1 Upgrade pymongo usage from deprecated connection to client 
LMS-1551
 2013-12-06 10:47:06 -05:00
Don Mitchell
43789a9252 Fixed test to ensure deletion on publish 2013-12-05 16:15:19 -05:00
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
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
Александр
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