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

Conflicts:
	cms/templates/settings.html
	cms/templates/widgets/header.html

2013-02-07 14:56:48 -05:00

..

models

Grading and details split out. Put the unimplemented tabs into a single

2013-02-07 14:45:24 -05:00

views

More for that commit

2013-02-07 14:46:42 -05:00

base.js

studio - soft landing: various fixes/tweaks

2013-02-07 14:09:47 -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