Don Mitchell 2db0401273 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag ...

Conflicts:
	cms/envs/common.py

2013-01-23 14:13:17 -05:00

..

client_templates

styling - settings layout and delete buttons

2012-12-13 13:35:58 -05:00

coffee

Handle metadata from save being empty

2013-01-11 10:39:57 -05:00

css

studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon

2013-01-22 23:32:51 -05:00

img

revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet

2013-01-13 12:47:30 -05:00

js

Fixed the y axis drop problem by requiring it to be within the x bounds.

2013-01-23 12:12:40 -05:00

sass

Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce

2013-01-22 16:15:27 -05:00