Merge branch 'master' of https://github.com/edx/edx-platform
Showing
- cms/djangoapps/api/apps.py 6 additions, 0 deletionscms/djangoapps/api/apps.py
- cms/djangoapps/api/urls.py 6 additions, 0 deletionscms/djangoapps/api/urls.py
- cms/djangoapps/api/v1/urls.py 6 additions, 0 deletionscms/djangoapps/api/v1/urls.py
- cms/djangoapps/api/v1/views/course_runs.py 5 additions, 0 deletionscms/djangoapps/api/v1/views/course_runs.py
- cms/djangoapps/pipeline_js/utils.py 2 additions, 0 deletionscms/djangoapps/pipeline_js/utils.py
- common/djangoapps/edxmako/paths.py 12 additions, 19 deletionscommon/djangoapps/edxmako/paths.py
- common/djangoapps/student/views/management.py 10 additions, 9 deletionscommon/djangoapps/student/views/management.py
- common/djangoapps/util/request_rate_limiter.py 59 additions, 0 deletionscommon/djangoapps/util/request_rate_limiter.py
- common/test/db_cache/bok_choy_data_default.json 1 addition, 1 deletioncommon/test/db_cache/bok_choy_data_default.json
- common/test/db_cache/bok_choy_migrations.sha1 1 addition, 1 deletioncommon/test/db_cache/bok_choy_migrations.sha1
- common/test/db_cache/bok_choy_migrations_data_default.sql 2 additions, 2 deletionscommon/test/db_cache/bok_choy_migrations_data_default.sql
- common/test/db_cache/bok_choy_migrations_data_student_module_history.sql 2 additions, 2 deletions...cache/bok_choy_migrations_data_student_module_history.sql
- common/test/db_cache/bok_choy_schema_default.sql 29 additions, 3 deletionscommon/test/db_cache/bok_choy_schema_default.sql
- common/test/db_cache/bok_choy_schema_student_module_history.sql 1 addition, 1 deletion.../test/db_cache/bok_choy_schema_student_module_history.sql
- lms/djangoapps/certificates/views/xqueue.py 6 additions, 6 deletionslms/djangoapps/certificates/views/xqueue.py
- lms/djangoapps/courseware/tests/test_about.py 2 additions, 2 deletionslms/djangoapps/courseware/tests/test_about.py
- lms/djangoapps/courseware/tests/test_microsites.py 2 additions, 5 deletionslms/djangoapps/courseware/tests/test_microsites.py
- lms/djangoapps/experiments/utils.py 3 additions, 158 deletionslms/djangoapps/experiments/utils.py
- lms/djangoapps/shoppingcart/views.py 2 additions, 2 deletionslms/djangoapps/shoppingcart/views.py
- lms/envs/bok_choy.py 6 additions, 0 deletionslms/envs/bok_choy.py
Loading
Please register or sign in to comment