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
Calen Pennington
3bb67a8b0e Merge pull request #1996 from cpennington/conditional-module-acceptance-tests 
Add acceptance tests of the conditional module
 2013-12-20 11:01:07 -08:00
cahrens
dc3b5ab57a Support unicode in text field. 
Part of STUD-868
 2013-12-20 13:31:16 -05:00
cahrens
df5b22e545 Fix exception to support unicode (and print url_name). 
Part of STUD-868
 2013-12-20 12:52:08 -05:00
Calen Pennington
06fadcdc0c Make conditional module and poll modules a little easier to understand 2013-12-20 12:32:15 -05:00
Don Mitchell
6c4aae731a Merge pull request #1980 from edx/dhm/locator_block_id 
Rename BlockUsageLocator's block_id field from usage_id
 2013-12-20 08:52:46 -08:00
jmclaus
5478525a42 Added JSInput template to Studio and a sop attribute to JSInput. Only if it's set to false, as in JSInput's template, will JSChannel be used to bypass it. In all other cases (attribute not present or set to something else), SOP is enforced. Compatibility with jsVGL is therefore maintained. Multiple JSInput are supported in a vertical. Also, save button now functions. [BLD-523, BLD-556, BLD-568] 2013-12-20 17:03:56 +01:00
Don Mitchell
a46e112a04 Improve test coverage 
and fix found errors.
 2013-12-20 10:44:01 -05:00
Valera Rozuvan
1542a74d2b Removed logme module. Using console.log() instead. 
Removing "logme" from comments.

BLD-608
 2013-12-20 16:25:44 +02:00
polesye
042cb5c698 BLD-206: Add template for the zooming image in Studio. 2013-12-19 21:47:32 +02:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor 
Stub Server Port Conflicts and Refactor
 2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain 
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
 2013-12-19 09:12:41 -05:00
polesye
24106a9203 BLD-590: Fix typos in Announcement template. 2013-12-19 14:14:30 +02:00
David Baumgold
36f35ac926 Reformat xml_importer.py to be more readable 2013-12-18 16:17:05 -05:00
polesye
70518a4659 BLD-506: Update behavior of start/end time fields. 2013-12-18 09:43:11 +02:00
Sarina Canelake
bc625ab571 Merge pull request #1904 from tusbar/player-size 
Stop forcing video player’s speeds widget width
 2013-12-17 13:16:05 -08:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id 
usage_id implies self-sufficiency. The block_id is relative to its structure.
 2013-12-17 12:15:32 -05:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
polesye
335a36f17c Address comments. 2013-12-17 13:22:08 +02:00
polesye
887eea30c9 Add comments. 2013-12-17 13:22:08 +02:00
polesye
6e01ce50c9 Add unit tests. 2013-12-17 13:22:08 +02:00
polesye
4e10c72988 BLD-21: Show answer for imageresponse. 2013-12-17 13:22:08 +02:00
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 12:47:49 +02:00
Valera Rozuvan
f03f3ebf96 Adding Jasmine tests for ImageInput. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
06b6535fb1 Using jQuery for all DOM manipulation. 2013-12-17 12:21:27 +02:00
Valera Rozuvan
7ebeccd4bf Updating ImageInput JS code base. 2013-12-17 12:21:19 +02:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
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
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