Calen Pennington feef179e3e Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing ...

Conflicts:
	cms/envs/common.py

2012-06-29 12:11:35 -04:00

..

djangoapps/contentstore

Make import work via mako again, to unblock others while I work on making the LMS work using XModuleDescriptors

2012-06-26 14:35:21 -04:00

envs

Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing

2012-06-29 12:11:35 -04:00

static

Parse XModuleDescriptors on import using from_xml

2012-06-26 11:56:21 -04:00

templates

Parse XModuleDescriptors on import using from_xml

2012-06-26 11:56:21 -04:00

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

manage.py

Fix string layout for readability

2012-06-19 11:29:14 -04:00

urls.py

Html Module can now be editing, saved, and re-opened

2012-06-22 10:58:18 -04:00