Gabe Mulley c9b0568acc Merge branch 'release' ...

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

2013-11-12 08:41:42 -05:00

..

features

Revert "BLD-408: Don't allow users to enter video url's in http."

2013-11-08 20:32:22 +02:00

management

Expand the edit_course_tabs help text

2013-11-06 16:39:44 -08:00

tests

Change delete_item to RESTful URL.

2013-11-06 13:49:24 -05:00

views

Revert "BLD-408: Don't allow users to enter video url's in http."

2013-11-08 20:32:22 +02: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

Include tail from header tag in course update.

2013-10-17 17:14:11 -04:00

debug_file_uploader.py

some tweeks to the negative testing

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

module_info_model.py

Use XBlock 0.3

2013-09-06 09:45:59 -04:00

transcripts_utils.py

Add Timed Transcripts Editor.

2013-10-22 21:45:03 +03:00

utils.py

Add Timed Transcripts Editor.

2013-10-22 21:45:03 +03:00