Diana Huang 51db547a63 Merge branch 'master' into diana/rubric-ui-improvements ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

2013-02-05 16:18:56 -05:00

..

capa

Update peer grading tests

2013-02-05 10:46:00 -05:00

xmodule

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05:00

.gitignore

Starting to generate jasmine tests for common/lib

2012-11-14 15:03:55 -05:00

logsettings.py

Defaulting service_variant to a blank string

2013-02-04 12:05:45 -05:00

rooted_paths.py

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

supertrace.py

add a handy supertrace script

2012-08-02 11:33:04 -04:00