Adam Palay e515842395 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/github.txt

2015-07-22 08:10:26 -04:00

..

migrations

MIT: CCX. Code Quality Fixes

2015-04-10 23:30:27 -04:00

tests

Cache CcxFieldOverrides on a per-request basis

2015-07-20 14:54:27 -04:00

__init__.py

MIT CCX: Use CCX Keys

2015-06-12 00:01:24 -07:00

models.py

Convert Meta classes to new-style classes

2015-07-13 17:33:26 -04:00

modulestore.py

MIT CCX: Use CCX Keys: further revisions in response to code review

2015-06-12 11:20:30 -07:00

overrides.py

Cache CcxFieldOverrides on a per-request basis

2015-07-20 14:54:27 -04:00

plugins.py

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -04:00

urls.py

MIT CCX: Use CCX Keys

2015-06-12 00:01:24 -07:00

utils.py

PLA-749 Fix student dashboard for users enrolled in CCX courses

2015-07-20 14:03:50 -04:00

views.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00