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

..

settings

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

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

course_info_edit.js

Ensure settings and course info CRUD operations tell the user if there's

2013-01-30 11:24:55 -05:00

grader-select-view.js

Generalized the grader drop down and applied to edit_subsection

2012-12-19 17:31:06 -05:00

overview.js

clean up note to self

2013-02-11 16:45:36 -05:00

server_error.js

Ensure settings and course info CRUD operations tell the user if there's

2013-01-30 11:24:55 -05:00

validating_view.js

Try to make server and validation errors work together. Getting double

2013-02-11 12:04:45 -05:00