cahrens 08ce212bd5 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy ...

Conflicts:
	cms/static/js/models/settings/advanced.js

2013-02-06 10:35:12 -05:00

..

settings

Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy

2013-02-06 10:35:12 -05:00

course_info.js

support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed

2012-12-07 09:45:12 -05:00

course_relative.js

Fixed course info bug (and simplified parsing). Incidentally fixed 2

2012-12-15 15:56:51 -05:00

module_info.js

support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed

2012-12-07 09:45:12 -05:00