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

..

add_coupon_modal.html

Update Instructor Dashboard UI text for enrollment codes

2015-06-03 16:35:23 -04:00

certificate-bulk-white-list.underscore

SOL-1455 enhancement

2015-12-11 14:56:43 +05:00

certificate-invalidation.underscore

Allow PMs to Invalidate Certificates

2016-01-04 14:28:32 +05:00

certificate-white-list-editor.underscore

Revised Generate Certificates Section and added Certificate Generation history UI.

2015-12-10 16:26:19 +05:00

certificate-white-list.underscore

Revised Generate Certificates Section and added Certificate Generation history UI.

2015-12-10 16:26:19 +05:00

certificates.html

fix typo on certificate page

2016-01-29 09:12:46 -05:00

cohort_management.html

Remove microsite_configuration/microsite.py references from individual templates

2016-01-22 14:27:58 -05:00

cohort-discussions-category.underscore

Cohort discussion topics via UI in instructor dashboard.

2015-03-23 14:28:22 +05:00

cohort-discussions-course-wide.underscore

Cohort discussion topics via UI in instructor dashboard.

2015-03-23 14:28:22 +05:00

cohort-discussions-inline.underscore

Cohort discussion topics via UI in instructor dashboard.

2015-03-23 14:28:22 +05:00

cohort-discussions-subcategory.underscore

Cohort discussion topics via UI in instructor dashboard.

2015-03-23 14:28:22 +05:00

cohort-editor.underscore

Allow Instructor To Rename Cohorts And Set Cohort Assignment Method

2015-03-23 09:10:59 +05:00

cohort-form.underscore

i18n fix

2015-09-24 13:02:12 +08:00

cohort-group-header.underscore

Added target='_blank' to both href attributes

2016-02-10 14:49:44 +05:00

cohort-selector.underscore

Rename 'cohort groups' to just 'cohorts'

2015-01-15 10:33:48 -05:00

cohort-state.underscore

Changes after Andy's Review

2015-03-23 09:21:21 +05:00

cohorts.underscore

Cohort discussion topics via UI in instructor dashboard.

2015-03-23 14:28:22 +05:00

course_info.html

Merge pull request #9351 from edx/release

2015-08-17 13:17:55 -04:00

data_download.html

Asynchronous download button for ORA2 data

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

e-commerce.html

SOL-1267

2015-10-07 13:58:46 +05:00

edit_coupon_modal.html

Update Instructor Dashboard UI text for enrollment codes

2015-06-03 16:35:23 -04:00

enrollment-code-lookup-links.underscore

SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes

2015-06-03 14:46:01 -04:00

executive_summary.html

I18N needs to not include the string substitution

2015-06-19 17:04:30 -04:00

extensions.html

Merge pull request #4911 from edx/sarina/a11y-extensions

2014-08-20 16:00:40 -04:00

generate_registarion_codes_modal.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

instructor_analytics.html

Add messaging about Insights to Analytics instructor tab

2015-07-15 11:11:09 -04:00

instructor_dashboard_2.html

LMS: fixing skip links and adding a11y tests

2016-02-17 07:46:42 -05:00

invalidate_registration_code_modal.html

SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes

2015-06-03 14:46:01 -04:00

membership.html

Remove microsite_configuration/microsite.py references from individual templates

2016-01-22 14:27:58 -05:00

metrics.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

notification.underscore

Small accessibility fixes for cohorts

2015-01-15 10:33:49 -05:00

send_email.html

Remove "instructor" label or change to "Admin"

2015-06-29 17:03:18 -04:00

set_course_mode_price_modal.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

special_exams.html

Add Timed Exams as a feature to edx-platform

2015-10-30 08:44:33 -04:00

student_admin.html

Updates the example locations to split format

2015-11-09 17:26:28 -05:00