Gabe Mulley c9b0568acc Merge branch 'release' ...

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

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

..

collections

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

models

Rename IsoTime to RelativeTime.

2013-10-23 13:06:12 +03:00

utils

Pull modal cover and date utils into their own files.

2013-10-23 15:44:58 -04:00

views

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

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

base.js

Change delete_item to RESTful URL.

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

index.js

RESTful refactoring of /course access continued

2013-10-30 13:28:22 -04:00

main.js

whitespace changes

2013-05-08 09:29:20 -04:00

sock.js

Move sock JS code into its own file.

2013-10-15 12:59:22 -04:00