Adam Palay b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master ...

Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py

2015-03-19 16:30:46 -04:00

..

migrations

s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

2014-12-01 11:22:08 -05:00

tests

Remove unused imports

2015-03-17 07:10:31 -04:00

__init__.py

Move code to instructor_task Django app.

2013-06-18 11:17:15 -04:00

admin.py

Fix PEP8: E302 expected 2 blank lines, found 1

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

api_helper.py

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

api.py

Instructor Dashboard management tools for Entrance Exams

2015-02-23 15:04:05 -05:00

models.py

Support cohorting students via a CSV File.

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

subtasks.py

Remove unused imports

2015-03-17 07:10:31 -04:00

tasks_helper.py

update instructor grade task state and increase logging

2015-03-19 07:52:22 -04:00

tasks.py

update instructor grade task state and increase logging

2015-03-19 07:52:22 -04:00

views.py

backend changes based on feedback

2015-03-04 15:32:56 +05:00