Calen Pennington 19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html

2014-05-12 11:35:03 -04:00

..

collections

These files are not being used.

2014-05-05 11:36:04 -04:00

models

These files are not being used.

2014-05-05 11:36:04 -04:00

spec

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

2014-05-12 11:35:03 -04:00

spec_helpers

Fix Jasmine tests

2014-05-02 16:20:17 -04:00

utils

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

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

views

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

2014-05-12 11:35:03 -04:00

base.js

save dates on enter key press

2014-04-09 13:02:11 +05:00

index.js

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

2014-05-07 12:56:43 -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