Chris Dodge 55c69a1e13 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info ...

Conflicts:
	lms/djangoapps/courseware/module_render.py

2012-11-06 14:20:59 -05:00

..

djangoapps

remove unneeded debugging traces

2012-10-30 15:56:02 -04:00

envs

Remove unused github_sync app

2012-10-23 13:40:49 -04:00

static

Merge pull request #993 from MITx/bug/cas/tom/long-class-names

2012-10-30 09:59:36 -07:00

templates

moved error message into form area; tweaked cancel behavior

2012-10-30 11:39:08 -04:00

__init__.py

Initial port of templates into filesystem based storage

2012-09-25 10:10:44 -04:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

Remove unused github_sync app

2012-10-23 13:40:49 -04:00