Commit Graph

313 Commits

Author SHA1 Message Date
ichuang
93b8ad3e4d Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 16:46:56 -04:00
Calen Pennington
cac53cf1a0 Switch the cms over to using django-pipeline 2012-06-19 14:30:19 -04:00
Calen Pennington
34a696cdf6 Merge branch 'master' into cpennington/cms
Conflicts:
	rakefile
	requirements.txt
2012-06-18 13:46:33 -04:00
ichuang
71788c121f change way gitreload is done (now runs script in data dir) 2012-06-14 16:49:09 -04:00
Victor Shnayder
9f38ccb65d add README.md for dogfood 2012-06-13 10:18:54 -04:00
ichuang
628ca00252 fix dogfood -> use CorrectMap 2012-06-10 22:56:16 -04:00
Calen Pennington
dc85e46315 Allow login in the cms, and read a particular course from mongo 2012-06-08 16:55:38 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00
Calen Pennington
05436e591b Make mitxmako available to both the lms and the cms 2012-06-08 11:27:22 -04:00
ichuang
9d0dfd2f02 fix dogfood wrt lms / xmodule reorg; fix textinput_dynamath call 2012-06-07 22:03:47 -04:00
Calen Pennington
4a0969df9d Move tests for xmodules into the xmodule library, and make them run without django 2012-06-07 10:46:10 -04:00
Calen Pennington
91b306b35a Moving capa and xmodule out of djangoapps/courseware, and removing django references from them 2012-06-06 14:15:32 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00