Calen Pennington c72b0bb293 Resolve merge conflicts relative to master

2014-05-09 15:31:20 -04:00

..

features

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-09 15:29:32 -04:00

management

Validate the args to SSCK

2014-05-09 10:26:06 -04:00

tests

fixed asset search query.

2014-05-09 10:28:34 -04:00

views

Resolve merge conflicts relative to master

2014-05-09 15:31:20 -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

context_processors.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

course_info_model.py

Tweaks course update html to avoid using list tags inappropriately.

2014-02-26 13:28:00 -05:00

debug_file_uploader.py

some tweeks to the negative testing

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

git_export_utils.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

utils.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00