Don Mitchell d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html

2013-02-12 16:57:00 -05:00

..

models

Fixed urls

2013-02-12 12:15:07 -05:00

views

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-12 16:57:00 -05:00

base.js

studio - resolved scss that relied on old body classes

2013-02-11 16:09:33 -05:00

hesitate.js

Simple zIndex rather than fancy stack works best.

2013-01-29 15:00:49 -05:00

main.js

Initial connection of student module with cms.

2012-07-13 11:51:32 -04:00

template_loader.js

add some permissions asserting

2012-12-14 16:26:15 -05:00