Skip to content

Commit 8ce50a4

Browse files
authored
Merge branch 'master' into lunyachek/fix/instructor-rtl-remove-horizontal-scroll
2 parents 0f56eab + 693680b commit 8ce50a4

File tree

397 files changed

+18499
-14591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

397 files changed

+18499
-14591
lines changed

.coveragerc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ omit =
2525
common/djangoapps/*/migrations/*
2626
openedx/core/djangoapps/*/migrations/*
2727
openedx/core/djangoapps/debug/*
28+
openedx/envs/*
2829
openedx/features/*/migrations/*
2930

3031
concurrency=multiprocessing

.coveragerc-local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ omit =
2424
common/djangoapps/*/migrations/*
2525
openedx/core/djangoapps/*/migrations/*
2626
openedx/core/djangoapps/debug/*
27+
openedx/envs/*
2728
openedx/features/*/migrations/*
2829

2930
concurrency=multiprocessing

.github/CODEOWNERS

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
# Core
44
common/djangoapps/student/
5-
common/djangoapps/student/models/__init__.py @openedx/2u-tnl
6-
common/djangoapps/student/models/course_enrollment.py @openedx/2u-tnl
5+
common/djangoapps/student/models/__init__.py @openedx/committers-edx-platform-2u-tnl
6+
common/djangoapps/student/models/course_enrollment.py @openedx/committers-edx-platform-2u-tnl
77
common/djangoapps/third_party_auth/
88
lms/djangoapps/course_api/blocks
99
lms/djangoapps/courseware/
1010
lms/djangoapps/grades/
1111
lms/djangoapps/instructor/
1212
lms/djangoapps/instructor_task/
1313
lms/djangoapps/mobile_api/
14-
openedx/core/djangoapps/commerce/ @openedx/2u-infinity
15-
openedx/core/djangoapps/credentials @openedx/2U-aperture
16-
openedx/core/djangoapps/credit @openedx/2U-aperture
17-
openedx/core/djangoapps/enrollments/ @openedx/2U-aperture
14+
openedx/core/djangoapps/commerce/ @openedx/committers-edx-platform-2u-infinity
15+
openedx/core/djangoapps/credentials @openedx/committers-edx-platform-2u-aperture
16+
openedx/core/djangoapps/credit @openedx/committers-edx-platform-2u-aperture
17+
openedx/core/djangoapps/enrollments/ @openedx/committers-edx-platform-2u-aperture
1818
openedx/core/djangoapps/heartbeat/
1919
openedx/core/djangoapps/oauth_dispatch
20-
openedx/core/djangoapps/user_api/ @openedx/2U-aperture
21-
openedx/core/djangoapps/user_authn/ @openedx/2U-infinity
22-
openedx/core/djangoapps/verified_track_content/ @openedx/2u-infinity
20+
openedx/core/djangoapps/user_api/ @openedx/committers-edx-platform-2u-aperture
21+
openedx/core/djangoapps/user_authn/ @openedx/committers-edx-platform-2u-infinity
22+
openedx/core/djangoapps/verified_track_content/ @openedx/committers-edx-platform-2u-infinity
2323
openedx/features/course_experience/
2424
xmodule/
2525

@@ -31,21 +31,21 @@ lms/djangoapps/edxnotes
3131
common/djangoapps/track/
3232

3333
# Credentials
34-
lms/djangoapps/certificates/ @openedx/2U-aperture
34+
lms/djangoapps/certificates/ @openedx/committers-edx-platform-2u-aperture
3535

3636
# Discovery
37-
common/djangoapps/course_modes/ @openedx/2U-aperture
37+
common/djangoapps/course_modes/ @openedx/committers-edx-platform-2u-aperture
3838
common/djangoapps/enrollment/
39-
common/djangoapps/entitlements/ @openedx/2U-aperture
40-
lms/djangoapps/branding/ @openedx/2U-aperture
41-
lms/djangoapps/commerce/ @openedx/2u-infinity
42-
lms/djangoapps/experiments/ @openedx/2u-infinity
43-
lms/djangoapps/gating/ @openedx/2u-infinity
44-
lms/djangoapps/learner_dashboard/ @openedx/2U-aperture
45-
lms/djangoapps/learner_home/ @openedx/2U-aperture
46-
openedx/features/content_type_gating/ @openedx/2u-infinity
39+
common/djangoapps/entitlements/ @openedx/committers-edx-platform-2u-aperture
40+
lms/djangoapps/branding/ @openedx/committers-edx-platform-2u-aperture
41+
lms/djangoapps/commerce/ @openedx/committers-edx-platform-2u-infinity
42+
lms/djangoapps/experiments/ @openedx/committers-edx-platform-2u-infinity
43+
lms/djangoapps/gating/ @openedx/committers-edx-platform-2u-infinity
44+
lms/djangoapps/learner_dashboard/ @openedx/committers-edx-platform-2u-aperture
45+
lms/djangoapps/learner_home/ @openedx/committers-edx-platform-2u-aperture
46+
openedx/features/content_type_gating/ @openedx/committers-edx-platform-2u-infinity
4747
openedx/features/course_duration_limits/
48-
openedx/features/discounts/ @openedx/2u-infinity
48+
openedx/features/discounts/ @openedx/committers-edx-platform-2u-infinity
4949

5050
# Ping Axim On-call if someone uses the QuickStart
5151
# https://docs.openedx.org/en/latest/developers/quickstarts/first_openedx_pr.html

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ updates:
66
schedule:
77
interval: "weekly"
88
reviewers:
9-
- "openedx/arbi-bom"
9+
- "openedx/wg-maintenance-edx-platform"

.github/workflows/add-remove-label-on-comment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ on:
1717
jobs:
1818
add_remove_labels:
1919
uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
20+

.github/workflows/pylint-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- module-name: openedx-1
2121
path: "openedx/core/types/ openedx/core/djangoapps/ace_common/ openedx/core/djangoapps/agreements/ openedx/core/djangoapps/api_admin/ openedx/core/djangoapps/auth_exchange/ openedx/core/djangoapps/bookmarks/ openedx/core/djangoapps/cache_toolbox/ openedx/core/djangoapps/catalog/ openedx/core/djangoapps/ccxcon/ openedx/core/djangoapps/commerce/ openedx/core/djangoapps/common_initialization/ openedx/core/djangoapps/common_views/ openedx/core/djangoapps/config_model_utils/ openedx/core/djangoapps/content/ openedx/core/djangoapps/content_libraries/ openedx/core/djangoapps/content_staging/ openedx/core/djangoapps/contentserver/ openedx/core/djangoapps/cookie_metadata/ openedx/core/djangoapps/cors_csrf/ openedx/core/djangoapps/course_apps/ openedx/core/djangoapps/course_date_signals/ openedx/core/djangoapps/course_groups/ openedx/core/djangoapps/courseware_api/ openedx/core/djangoapps/crawlers/ openedx/core/djangoapps/credentials/ openedx/core/djangoapps/credit/ openedx/core/djangoapps/dark_lang/ openedx/core/djangoapps/debug/ openedx/core/djangoapps/discussions/ openedx/core/djangoapps/django_comment_common/ openedx/core/djangoapps/embargo/ openedx/core/djangoapps/enrollments/ openedx/core/djangoapps/external_user_ids/ openedx/core/djangoapps/zendesk_proxy/ openedx/core/djangolib/ openedx/core/lib/ openedx/core/djangoapps/course_live/"
2222
- module-name: openedx-2
23-
path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
23+
path: "openedx/core/djangoapps/geoinfo/ openedx/core/djangoapps/header_control/ openedx/core/djangoapps/heartbeat/ openedx/core/djangoapps/lang_pref/ openedx/core/djangoapps/models/ openedx/core/djangoapps/monkey_patch/ openedx/core/djangoapps/oauth_dispatch/ openedx/core/djangoapps/olx_rest_api/ openedx/core/djangoapps/password_policy/ openedx/core/djangoapps/plugin_api/ openedx/core/djangoapps/plugins/ openedx/core/djangoapps/profile_images/ openedx/core/djangoapps/programs/ openedx/core/djangoapps/safe_sessions/ openedx/core/djangoapps/schedules/ openedx/core/djangoapps/service_status/ openedx/core/djangoapps/session_inactivity_timeout/ openedx/core/djangoapps/signals/ openedx/core/djangoapps/site_configuration/ openedx/core/djangoapps/system_wide_roles/ openedx/core/djangoapps/theming/ openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/core/djangoapps/util/ openedx/core/djangoapps/verified_track_content/ openedx/core/djangoapps/video_config/ openedx/core/djangoapps/video_pipeline/ openedx/core/djangoapps/waffle_utils/ openedx/core/djangoapps/xblock/ openedx/core/djangoapps/xmodule_django/ openedx/core/tests/ openedx/features/ openedx/testing/ openedx/tests/ openedx/envs/ openedx/core/djangoapps/notifications/ openedx/core/djangoapps/staticfiles/ openedx/core/djangoapps/content_tagging/"
2424
- module-name: common
2525
path: "common"
2626
- module-name: cms

.github/workflows/unit-test-shards.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@
238238
"cms/djangoapps/cms_user_tasks/",
239239
"cms/djangoapps/course_creators/",
240240
"cms/djangoapps/export_course_metadata/",
241-
"cms/djangoapps/import_from_modulestore/",
242241
"cms/djangoapps/maintenance/",
243242
"cms/djangoapps/models/",
244243
"cms/djangoapps/pipeline_js/",

.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
key: docker-${{ runner.os }}-mongo-${{ matrix.mongo-version }}
8383

8484
- name: Start MongoDB
85-
uses: supercharge/mongodb-github-action@1.11.0
85+
uses: supercharge/mongodb-github-action@1.12.0
8686
with:
8787
mongodb-version: ${{ matrix.mongo-version }}
8888

.github/workflows/upgrade-python-requirements.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
uses: openedx/.github/.github/workflows/upgrade-python-requirements.yml@master
1717
with:
1818
branch: ${{ github.event.inputs.branch }}
19-
team_reviewers: "arbi-bom"
20-
email_address: arbi[email protected]
19+
team_reviewers: "wg-maintenance-edx-platform"
20+
email_address: orbi[email protected]
2121
send_success_notification: false
2222
secrets:
2323
requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,7 @@ compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *
121121
@# Bootstrapping: Rebuild pip and pip-tools first, and then install them
122122
@# so that if there are any failures we'll know now, rather than the next
123123
@# time someone tries to use the outputs.
124-
sed '/^django-simple-history==/d' requirements/common_constraints.txt > requirements/common_constraints.tmp
125-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
126-
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
127-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
128-
sed 's/event-tracking<2.4.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
124+
sed 's/Django<5.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
129125
mv requirements/common_constraints.tmp requirements/common_constraints.txt
130126
pip-compile -v --allow-unsafe ${COMPILE_OPTS} -o requirements/pip.txt requirements/pip.in
131127
pip install -r requirements/pip.txt

0 commit comments

Comments
 (0)