Merge pull request #12072 from edx/merge-release-into-master (810a5a79) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

810a5a79

Commit 810a5a79 authored 8 years ago by Adam

Downloads
- Plain Diff

Merge pull request #12072 from edx/merge-release-into-master

Merge release into master

parents abba913b 76f0fb0f

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

common/djangoapps/course_modes/models.py 1 addition, 1 deletion

common/djangoapps/course_modes/models.py
lms/djangoapps/certificates/views/support.py 6 additions, 1 deletion

lms/djangoapps/certificates/views/support.py
lms/djangoapps/courseware/date_summary.py 21 additions, 0 deletions

lms/djangoapps/courseware/date_summary.py
lms/djangoapps/courseware/tests/test_date_summary.py 43 additions, 11 deletions

lms/djangoapps/courseware/tests/test_date_summary.py
lms/djangoapps/instructor/tests/test_certificates.py 32 additions, 8 deletions

lms/djangoapps/instructor/tests/test_certificates.py
lms/djangoapps/instructor/views/api.py 13 additions, 28 deletions

lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor_task/api.py 36 additions, 18 deletions

lms/djangoapps/instructor_task/api.py
lms/djangoapps/instructor_task/tasks_helper.py 35 additions, 9 deletions

lms/djangoapps/instructor_task/tasks_helper.py
lms/djangoapps/instructor_task/tests/test_api.py 13 additions, 0 deletions

lms/djangoapps/instructor_task/tests/test_api.py
lms/djangoapps/instructor_task/tests/test_tasks_helper.py 210 additions, 106 deletions

lms/djangoapps/instructor_task/tests/test_tasks_helper.py
lms/templates/instructor/instructor_dashboard_2/certificate-white-list.underscore 2 additions, 1 deletion

.../instructor_dashboard_2/certificate-white-list.underscore

with 412 additions and 183 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment