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

..

djangoapps

fixing merge conflict from release

2013-12-19 16:34:25 -05:00

lib

Merge pull request #1980 from edx/dhm/locator_block_id

2013-12-20 08:52:46 -08:00

static

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

templates

remove unused jasmine resources

2013-11-07 12:04:35 -05:00

test

whitespace-only changes

2013-12-10 11:45:49 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…