David Ormsbee 43d8c7a712 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py

2014-11-13 10:11:12 -05:00

..

features

merge branch 'release' fix.

2014-10-07 16:32:16 -04:00

management

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

tests

Merge branch 'release'

2014-11-13 10:11:12 -05:00

views

Merge pull request #5838 from edx/dsjen/feature-flag-analytics-enrollments

2014-11-12 10:40:04 -05:00

__init__.py

move instructor dashboard into its own lms djangoapp; add new

2012-09-02 19:05:34 -04:00

access.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

enrollment.py

Prevent instructors from accidentally downgrading enrollment modes through instructor dash TNL-804

2014-11-10 18:04:22 -05:00

hint_manager.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

offline_gradecalc.py

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

utils.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00