Calen Pennington 95f8f811c5 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

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

2013-03-11 10:49:29 -04:00

..

features

Speed up the lettuce test for no policy settings.

2013-03-08 13:34:28 -05:00

management

Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util

2013-03-04 13:11:46 -08:00

tests

Fixing tests created on master

2013-03-11 10:48:06 -04:00

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

course_info_model.py

Fix tests

2013-02-15 15:44:11 -05:00

module_info_model.py

Set up dev environment for testing xml vs mongo vs split_mongo modulestores

2013-02-13 14:04:21 -05:00

utils.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

views.py

Add advanced_modules course setting back in.

2013-03-08 16:07:59 -05:00