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

..

migrations

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

tests

Asynchronous download button for ORA2 data

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

admin.py

Fix PEP8: E302 expected 2 blank lines, found 1

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

api_helper.py

Fix HTTP_USER_AGENT latin1 characters

2016-01-20 18:40:09 +05:00

api.py

Asynchronous download button for ORA2 data

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

models.py

Remove deprecation warnings from Django models.

2016-02-09 09:28:43 -05:00

subtasks.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

tasks_helper.py

Asynchronous download button for ORA2 data

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

tasks.py

Asynchronous download button for ORA2 data

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

views.py

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

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