Julian Arni 7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime ...

Conflicts:
	cms/djangoapps/contentstore/views/preview.py

2013-08-12 15:04:49 -04:00

..

features

Migrate acceptance tests: old Video -> new Video.

2013-08-12 14:32:07 +03:00

management

rename clone.py to a more descriptive clone_course.py

2013-08-02 22:30:31 -04:00

tests

Merge pull request #564 from edx/db/xblock-student-view

2013-08-12 11:55:40 -07:00

views

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:04:49 -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

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

No longer persist XModule templates

2013-07-16 14:33:58 -04:00

utils.py

Removed get_url_reverse function

2013-07-29 13:11:48 -04:00