Adam Palay d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2014-07-07 13:54:03 -04:00

..

djangoapps

Merge branch 'rc/2014-07-02' into testmergemaster

2014-07-07 13:54:03 -04:00

envs

Merge pull request #4283 from edx/clytwynec/lms_cms_joint_bokchoy_test

2014-07-02 12:42:49 -04:00

lib

Display names, help text, and "deprecated" for Advanced Settings.

2014-06-26 16:54:22 -04:00

static

Update discussion tab sidebar header

2014-07-02 16:58:34 -04:00

templates

Update discussion tab sidebar header

2014-07-02 16:58:34 -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

Fixed urlpatterns regex for support views in dashboard app.

2014-07-02 16:01:25 +05:00

wsgi_apache_lms.py

apache lms wsgi fix

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

wsgi.py

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00