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

..

base.txt

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

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

edx-private.txt

Upgrade JSDraw.

2014-04-10 12:01:02 -04:00

github.txt

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

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

local.txt

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

2014-05-08 07:40:25 -04:00

paver.txt

Added watchdog to Paver requirements

2014-04-18 15:38:26 -04:00

post.txt

Upgrade mysql-python to 1.2.5

2014-05-08 13:19:01 -04:00

pre.txt

Dependency warning message on requirements files

2013-08-01 14:49:49 -04:00

repo.txt

moving requirements files to a directory that corresponds with the virtualenv name

2013-05-16 14:30:01 -04:00