Calen Pennington cfd6890d68 Merge remote-tracking branch 'origin/master' into cpennington/cms-github ...

Conflicts:
	common/lib/xmodule/xmodule/xml_module.py

2012-07-10 08:50:54 -04:00

..

widgets

Get rid of comments

2012-07-09 11:08:07 -04:00

base.html

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

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

course_index.html

Make course index page read from url for org, course, name

2012-07-03 14:29:50 -04:00

index.html

Add an index page that lists all courses

2012-07-03 14:44:41 -04:00

login.html

Allow login in the cms, and read a particular course from mongo

2012-06-08 16:55:38 -04:00

unit.html

Added new icons for all of the content

2012-07-09 10:04:20 -04:00