ichuang 220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static ...

Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py

2013-08-19 08:24:35 -04:00

..

djangoapps

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-19 08:24:35 -04:00

lib

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-19 08:24:35 -04:00

static

Fix initial loading bug.

2013-08-13 13:33:51 -04:00

templates

gst integration into studio

2013-07-26 17:22:27 +03:00

test

xblock fields persist w/o breaking by scope

2013-08-16 10:42:52 -04: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