Chris Dodge 322c4c0ba6 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html

2012-10-04 11:03:37 -04:00

..

coffee

Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module)

2012-10-03 14:24:11 -04:00

css

Remove old pre-compiled css

2012-06-21 10:59:46 -04:00

img

added temp labs logo

2012-10-03 17:26:14 -04:00

js

update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element

2012-10-04 10:58:48 -04:00

sass

Merge pull request #819 from MITx/feature/cale/cas-unit-location-view

2012-10-04 07:57:11 -07:00