ichuang 220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static ...

Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py

2013-08-19 08:24:35 -04:00

..

features

Fix grade range names not being editable.

2013-08-15 16:30:14 -04:00

management

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-19 08:24:35 -04:00

tests

Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore

2013-08-17 07:32:51 -07:00

views

Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore

2013-08-17 07:32:51 -07: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

Wrap malformed course_update rather than silently failing update

2013-07-30 12:08:57 -04:00

debug_file_uploader.py

some tweeks to the negative testing

2013-07-09 19:16:00 -04:00

module_info_model.py

some additional comments to clarify the partially bogus course_id.

2013-08-15 22:58:03 -04:00

utils.py

Make split mongo read-only API consistent with other modulestores.

2013-08-13 15:06:08 -04:00