Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

djangoapps

Merge branch 'release'

2014-01-16 12:51:22 -05:00

envs

Merge branch 'release'

2014-01-16 12:51:22 -05:00

lib

Add handler_url usable by descriptors

2013-12-20 14:05:53 -05:00

static

dont update iframe src attribute if it is empty

2014-01-16 13:33:54 +05:00

templates

Cleaned up modules to reflect centralizing auth

2014-01-14 17:04:44 -05:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

startup.py

Very Minor tweaks to the LMS and CMS startup.

2014-01-02 14:27:52 -05:00

urls_dev.py

pylint cleanup

2013-08-01 14:16:55 -04:00

urls.py

Add handler_url usable by descriptors

2013-12-20 14:05:53 -05:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00