Diana Huang 79fea6205e Merge branch 'release' ...

Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt

2014-04-16 15:41:59 -04:00

..

djangoapps

Merge pull request #3084 from edx/sarina/improve-bulk-beta-add

2014-04-16 14:07:51 -04:00

envs

Serve video HTML5 sources locally for acceptance tests

2014-04-15 10:40:53 -04:00

lib

Add more tags to comment_client request metrics

2014-03-28 11:37:44 -04:00

static

Merge branch 'release'

2014-04-16 15:41:59 -04:00

templates

Merge branch 'release'

2014-04-16 15:41:59 -04:00

__init__.py

…

.coveragerc

…

startup.py

Fix bad interaction between pluggable InputTypes and Microsites

2014-04-01 16:49:15 -04:00

tests.py

Test TemplateLookup dirs are not cleared during lms startup.

2014-04-03 20:23:44 +05:00

urls.py

This makes the metrics tab "bars" clickable.

2014-04-11 13:56:49 -07:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Remove extraneous configuration

2014-02-04 15:35:26 -05:00