Chris Dodge 7107e3ee66 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-crud-section-subsection ...

Conflicts:
	cms/static/js/base.js

2012-10-10 13:50:22 -04:00

..

auth

respond to Cale pull request comments. Update access.py (LMS) to use the same 'check for legacy group name first' logic. Add SECRET_KEY setting to the CAS project so that auth tokens from CAS are accepted in the LMS

2012-10-09 15:11:07 -04:00

contentstore

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-crud-section-subsection

2012-10-10 13:50:22 -04:00

github_sync

Make saving also save the children in the #sortable element (TODO: name the #sortable element better)

2012-09-18 13:19:30 -04:00