Brian Wilson d6a74a644d Merge branch 'master' into release ...

Conflicts:
	cms/static/js/views/modals/edit_xblock.js

2014-05-13 11:10:48 -04:00

..

djangoapps

Merge pull request #3464 from mitocw/cg/course_image_fixes

2014-05-13 09:19:07 -04:00

envs

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

lib

Allow extra fields returned from comments service

2014-05-12 13:49:24 -04:00

static

Merge pull request #3585 from dragonfi/master

2014-05-13 19:06:40 +05:00

templates

Merge branch 'master' into release

2014-05-13 11:10:48 -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

Change URL patterns for instructor dashboard

2014-05-12 10:18:28 -04: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