Commit Graph

17 Commits

Author SHA1 Message Date
Calen Pennington
23195e9d76 Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken 2012-06-29 12:45:17 -04:00
Calen Pennington
de07b8b345 Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js 2012-06-29 12:40:50 -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
Calen Pennington
5404345b1f Make tests pass when running on cms 2012-06-18 13:21:06 -04:00
Calen Pennington
967a6ee2e7 Merge pull request #94 from MITx/capa-cleanup
Capa cleanup
2012-06-12 12:26:49 -07:00
Matthew Mongeau
d0819071c7 PROJECT_ROOT is needed for coffeescript paths 2012-06-11 13:57:37 -04:00
ichuang
6f14acee9e add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-10 22:34:30 -04:00
ichuang
989a74ba3f django pipeline working now (with new pip -e git+git...) 2012-06-10 20:05:33 -04:00
Calen Pennington
8134bcbc3d Get the cms up to the point of rendering a template 2012-06-08 14:01:41 -04:00
David Ormsbee
bd2a44ade9 Merge pull request #90 from MITx/cpennington/capa_django_deps
Removing references to django.conf.settings from capa/responsetypes.py
2012-06-07 16:18:08 -07:00
Calen Pennington
1d1af3be74 Move coverage report html into the reports directory 2012-06-07 17:00:03 -04:00
Bridger Maxwell
8a523997b1 Added setting for new changes to django-pipeline. Only sass is recompiled each time now. 2012-06-07 16:49:51 -04:00
Calen Pennington
c3e730a0a2 Add the capa module templates to the list of mako templates 2012-06-07 16:44:57 -04:00
Calen Pennington
54756bf5e2 Use relative includes in settings files 2012-06-06 14:16:28 -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