cahrens c95b44d851 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-05-23 11:41:12 -04:00

..

settings

Hook up notification framework to default AJAX error callback

2013-05-22 15:55:49 -04:00

checklists.js

Fix caching bug on back button.

2013-03-22 09:51:45 -04:00

course_info.js

whitespace changes

2013-05-08 09:29:20 -04:00

course_relative.js

whitespace changes

2013-05-08 09:29:20 -04:00

feedback.js

Unify system feedback templates

2013-05-22 15:55:55 -04:00

metadata_model.js

Jasmine test for metadata model.

2013-05-20 16:26:48 -04:00

module_info.js

whitespace changes

2013-05-08 09:29:20 -04:00

section.js

Unify system feedback templates

2013-05-22 15:55:55 -04:00