Calen Pennington aff44b1f11 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-10-02 12:12:55 -04:00

..

auth

add distinct 'admin' role separate from 'editors'. Only 'admins' should be able to add/remove editors.

2012-10-01 15:13:20 -04:00

contentstore

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-10-02 12:12:55 -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