ichuang 62e113e9fc Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path ...

Conflicts:
	common/djangoapps/xmodule_modifiers.py

2013-10-07 21:23:05 -04:00

..

djangoapps

Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path

2013-10-07 21:23:05 -04:00

lib

Merge pull request #1220 from edx/jmclaus/bugfix_bypass_captions

2013-10-04 15:02:45 -07:00

static

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

templates

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

test

Fix regexp.

2013-10-02 21:45:38 +03:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00