Julia Hansbrough 2204eb7390 Fixed merge conflict between release and master.

2014-08-13 18:11:30 +00:00

..

djangoapps

Fixed merge conflict between release and master.

2014-08-13 18:11:30 +00:00

envs

Merge pull request #4802 from edx/will/unit-test-staticfiles

2014-08-12 16:42:19 -04:00

lib

ispublic is in active use by Stanford.

2014-07-18 20:28:06 -04:00

static

LMS: adding rendering/styling support for initial professional ed course types on student dashboard

2014-08-12 18:45:10 +00:00

templates

Fixed merge conflict between release and master.

2014-08-13 18:11:30 +00:00

__init__.py

…

.coveragerc

…

startup.py

Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""

2014-07-30 17:01:52 -04:00

tests.py

Add missing mimetypes for xblock resources

2014-05-29 11:14:00 -04:00

urls.py

added course price set/view/edit functionality

2014-08-05 10:00:13 -04: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