dylanrhodes 2b1a7eece2 Asynchronous download button for ORA2 data ...

Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html

2016-03-10 09:58:55 -05:00

..

__init__.py

Move code to instructor_task Django app.

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

factories.py

Remove pylint pragmas from "class Meta"

2015-10-21 07:37:00 -04:00

test_api.py

Asynchronous download button for ORA2 data

2016-03-10 09:58:55 -05:00

test_base.py

Remove all request.REQUEST usages - replace with request.GET and/or

2016-02-22 09:54:26 -05:00

test_integration.py

Remove needless 'disable=no-member' pragmas

2015-08-03 17:47:44 -04:00

test_models.py

SOL-794 Detailed Enrollment Report

2015-05-22 15:16:57 -04:00

test_subtasks.py

Revert "Revert "use different queue for smaller emails (TNL-1591)""

2015-04-15 12:03:23 -04:00

test_tasks_helper.py

Asynchronous download button for ORA2 data

2016-03-10 09:58:55 -05:00

test_tasks.py

Asynchronous download button for ORA2 data

2016-03-10 09:58:55 -05:00

test_views.py

Remove all request.REQUEST usages - replace with request.GET and/or

2016-02-22 09:54:26 -05:00