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

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

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

..

tests

Fixing email link injection bug

2013-12-18 13:38:36 -05:00

__init__.py

Make tests pass when running on cms

2012-06-18 13:21:06 -04:00

cache.py

Pep8 autofixes

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

json_request.py

Restful api for course advanced settings

2013-11-26 10:17:52 -05:00

memcache.py

safe_key() now hashes the prefix/version as well, just in case

2013-05-07 15:48:51 -04:00

models.py

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

query.py

Response to CR 1-14

2014-01-15 00:27:14 +00:00

request.py

Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org

2014-01-14 14:36:01 -05:00

sandboxing.py

also add some defaulting to the querying of the settings where it defaults to an empty set

2013-07-11 12:12:42 -04:00

string_utils.py

Code review feedback.

2013-11-14 17:09:24 -05:00

testing.py

Make the UrlResetMixin load the urlconf after resetting it, and fix the comment client test that was leaving ENABLE_DISCUSSION_SERVICE at True

2013-06-27 11:05:09 -04:00

views.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00