Merge branch 'master' into release-mergeback-to-master
Showing
- cms/templates/js/course-outline.underscore 1 addition, 1 deletioncms/templates/js/course-outline.underscore
- common/djangoapps/course_action_state/managers.py 3 additions, 2 deletionscommon/djangoapps/course_action_state/managers.py
- common/djangoapps/course_action_state/migrations/0001_initial.py 1 addition, 2 deletions...djangoapps/course_action_state/migrations/0001_initial.py
- common/djangoapps/course_action_state/models.py 1 addition, 1 deletioncommon/djangoapps/course_action_state/models.py
- common/djangoapps/course_action_state/tests/test_managers.py 3 additions, 0 deletionscommon/djangoapps/course_action_state/tests/test_managers.py
- common/djangoapps/course_action_state/tests/test_rerun_manager.py 2 additions, 0 deletions...jangoapps/course_action_state/tests/test_rerun_manager.py
- common/djangoapps/enrollment/management/commands/enroll_user_in_course.py 1 addition, 0 deletions...s/enrollment/management/commands/enroll_user_in_course.py
- common/djangoapps/enrollment/management/tests/test_enroll_user_in_course.py 4 additions, 1 deletion...enrollment/management/tests/test_enroll_user_in_course.py
- common/djangoapps/enrollment/tests/fake_data_api.py 2 additions, 0 deletionscommon/djangoapps/enrollment/tests/fake_data_api.py
- common/djangoapps/enrollment/tests/test_api.py 2 additions, 0 deletionscommon/djangoapps/enrollment/tests/test_api.py
- common/djangoapps/enrollment/tests/test_data.py 27 additions, 23 deletionscommon/djangoapps/enrollment/tests/test_data.py
- common/djangoapps/enrollment/tests/test_views.py 40 additions, 40 deletionscommon/djangoapps/enrollment/tests/test_views.py
- common/djangoapps/student/admin.py 114 additions, 2 deletionscommon/djangoapps/student/admin.py
- common/djangoapps/student/migrations/0020_auto_20190227_2019.py 19 additions, 0 deletions.../djangoapps/student/migrations/0020_auto_20190227_2019.py
- common/djangoapps/student/models.py 30 additions, 1 deletioncommon/djangoapps/student/models.py
- common/djangoapps/student/tests/test_admin_views.py 69 additions, 1 deletioncommon/djangoapps/student/tests/test_admin_views.py
- common/djangoapps/student/views/dashboard.py 9 additions, 6 deletionscommon/djangoapps/student/views/dashboard.py
- common/djangoapps/third_party_auth/api/tests/test_views.py 32 additions, 0 deletionscommon/djangoapps/third_party_auth/api/tests/test_views.py
- common/djangoapps/third_party_auth/api/urls.py 6 additions, 1 deletioncommon/djangoapps/third_party_auth/api/urls.py
- common/djangoapps/third_party_auth/api/views.py 53 additions, 1 deletioncommon/djangoapps/third_party_auth/api/views.py
Loading
Please register or sign in to comment