Chris Dodge d9fa723eb2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py

2013-04-10 12:02:16 -04:00

..

features

Update tests for GMT, get Advanced Settings test to pass reliably.

2013-04-05 10:47:58 -04:00

management

pylint/pep8 fixes

2013-04-05 10:53:18 -04:00

tests

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

2013-04-08 15:02:47 -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

Unit tests and minor fixes to course_info_updates. Main fix was

2013-03-20 17:49:03 -04:00

module_info_model.py

Iterate over metadata items when setting module info

2013-03-11 14:32:56 -04:00

utils.py

Merge branch 'master' into bug/christina/studio

2013-04-01 12:30:07 -04:00

views.py

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

2013-04-10 12:02:16 -04:00