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

Conflicts:
	cms/templates/widgets/header.html

2014-05-19 09:20:08 -04:00

..

djangoapps

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

2014-05-19 09:20:08 -04:00

envs

Use path already created by ansible.

2014-05-16 16:37:39 -04:00

lib

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

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

static

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

2014-05-13 15:30:56 -04:00

templates

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

2014-05-19 09:20:08 -04:00

__init__.py

…

.coveragerc

…

startup.py

Remove obselete cms startup code

2014-01-24 16:42:38 -05:00

urls_dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

urls.py

Fix ssl redirection test

2014-05-13 14:13:45 -04:00

wsgi.py

…