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

Make the rubric smaller so that we can accomodate more columns.

2013-01-11 09:31:38 -05:00

codemirror

added code mirror styles

2012-10-03 09:47:19 -04:00

combinedopenended

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

2013-02-05 09:13:14 -05:00

editor

Some refactoring from Brian's submission.

2013-01-17 10:36:04 -05:00

html

studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style

2013-02-05 15:21:41 -05:00

problem

studio - further resolved bug with .header CSS inheritance and problem editor menu UI

2013-01-23 12:58:20 -05:00

sequence

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

video

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00