Commit Graph

12 Commits

Author SHA1 Message Date
Calen Pennington
b0ff3053b9 Add development code for pushing CMS changes to github 2012-07-03 19:06:07 -04:00
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
Calen Pennington
919f8cf261 Import x_module using the full path 2012-06-28 11:28:42 -04:00
Calen Pennington
e9a00ffc5a Parse XModuleDescriptors on import using from_xml
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
2012-06-26 11:56:21 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Calen Pennington
69290c18c3 Live editing of html modules implemented, but no saving to the backend 2012-06-21 15:33:52 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
b91a1d48b6 Remove reference to instructor module 2012-06-19 11:44:54 -04:00
Calen Pennington
703103e767 Get rid of references to askbot 2012-06-19 11:25:41 -04:00
Calen Pennington
b9befbafcd Add contentstore from cms proto as a baseline for importing and views for the cms 2012-06-13 11:42:50 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00