Vik Paruchuri 687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

2013-08-08 19:03:46 -04:00

..

djangoapps

Fixed some of the ui-helpers and made the course-team test faster

2013-08-08 13:24:27 -04:00

lib

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-08 19:03:46 -04:00

static

Assign isExternal JS function to window object

2013-08-06 16:39:04 -04:00

templates

gst integration into studio

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

test

add unit tests around asserting that /static/ links are not re-written on import

2013-08-05 16:15:03 -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