Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6289 commits
Select commit Hold shift + click to select a range
5e0ae6b
Remove modal flag from code (#25482)
Tj-Tracy Nov 2, 2020
2cc0688
convert enterprise customer uuid to str before comparison
muhammad-ammar Nov 2, 2020
c4468b5
Merge pull request #25502 from edx/ammar/convert-to-str-before-compar…
muhammad-ammar Nov 2, 2020
57d33f1
Merge pull request #25496 from edx/nedbat/https-openedx
nedbat Nov 2, 2020
39a7c64
remove internal references to edx_django_utils
robrap Oct 31, 2020
acd8459
Merge pull request #25504 from edx/robrap/ARCHBOM-1584-fix-monitoring…
robrap Nov 2, 2020
f414fad
Change gendered language to gender-neutral 'they/them/their'
sarina Nov 2, 2020
dbf6ef2
Using logging filters from edx-django-utils (#25492)
moconnell1453 Nov 3, 2020
0f39482
Updating Python Requirements
edx-requirements-bot Nov 3, 2020
028be7e
Merge pull request #25508 from edx/jenkins/upgrade-python-requirement…
UsamaSadiq Nov 3, 2020
7cd9c66
Merge pull request #25476 from edx/adeel/van_98_update_confirm_passwo…
adeelkhan Nov 3, 2020
dafac0c
updated Dockerfile to use ubuntu 20.04 as base (#25435)
mraarif Nov 3, 2020
0925500
downgrade ORA (#25499) (#25509)
jansenk Nov 3, 2020
831658c
pin ora temporarily (#25510)
jansenk Nov 3, 2020
64a162f
Merge pull request #25494 from regisb/regisb/fix-swaggerdocs
robrap Nov 3, 2020
16ce16e
Deprecate ExperimentWaffleFlag.override method
regisb Oct 23, 2020
2307dff
Deprecate WaffleFlag.override method
regisb Oct 23, 2020
3b127f8
Deprecate WaffleSwitch.override* methods
regisb Oct 23, 2020
4586002
Import waffle classes from edx_toggles instead of waffle_utils
regisb Oct 23, 2020
b700424
Deprecate waffle_utils.testutils.override* functions
regisb Oct 29, 2020
c9c1136
Re-introduce waffle classes (with deprecation warnings)
regisb Oct 29, 2020
4a0e4aa
Merge pull request #25417 from regisb/regisb/deprecate-toggle-override
robrap Nov 3, 2020
8916944
Handle more kinds of bad data in segment events. (#25506)
brianhw Nov 3, 2020
ead2825
Re-add course key to segment unenroll tracker (#25516)
Tj-Tracy Nov 3, 2020
18059c2
Merge pull request #25505 from edx/sarina/gender-neutral-language
sarina Nov 3, 2020
9c312c2
Updating Python Requirements (#25518)
edx-requirements-bot Nov 4, 2020
415a433
Updated edx-enterprise version to 3.10.2 that contains a bug fix for …
saleem-latif Nov 4, 2020
bc838e4
SysAdmin: Removed external authentication map repair button from User…
arslanashraf7 Nov 4, 2020
d14f6c4
Merge pull request #25520 from edx/saleem-latif/ENT-3522-bug-fix
saleem-latif Nov 4, 2020
84d2a69
update devstack video upload authentication mechanism
DawoudSheraz Nov 4, 2020
d550546
upgrade edx-enterprise version to 3.10.3
saleem-latif Nov 4, 2020
f0aae8e
* update DSC needed cache key to invalidate existing stored values
muhammad-ammar Nov 3, 2020
e4cb3df
Merge pull request #25522 from edx/saleem-latif/ENT-3522-bug-fix-2
saleem-latif Nov 4, 2020
d1a775d
Use full names for lms.djangoapps imports (#25401)
kdmccormick Nov 4, 2020
dd732c4
Merge pull request #25514 from edx/ammar/update-dsc-cache-key
muhammad-ammar Nov 4, 2020
da06231
Expose SettingToggle and SettingDictToggle objects in the API
regisb Oct 13, 2020
cb57a28
Merge pull request #25488 from regisb/regisb/toggle-state-endpoint-se…
robrap Nov 4, 2020
103ec9e
REV-1564: add user-metadata API, for use by Optimizely experiments (#…
dianekaplan Nov 4, 2020
e3bc66f
geoip2: update maxmind geolite country database
Nov 4, 2020
3a46e7c
Squashes waffle_utils.WaffleFlag deprecation warning
nizarmah Nov 4, 2020
b32fc50
Improve monitoring of waffle deprecation with custom attributes
regisb Nov 5, 2020
1723da9
Merge pull request #25519 from edx/dsheraz/PROD-2198
DawoudSheraz Nov 5, 2020
8522579
Merge pull request #25527 from open-craft/nizar/squash_waffle_flag_wa…
robrap Nov 5, 2020
73a16a9
Ensure we don't break unit tests by upgrading edx-completion
regisb Nov 5, 2020
97e9fee
Add third party auth context api (#25497)
zainab-amir Nov 5, 2020
a82ce03
Upgrade codejail to 3.1.0 from 3.0.1
kdmccormick Oct 29, 2020
758c2b0
Pass course-run-specific resource limits to codejail
kdmccormick Oct 29, 2020
e4befb1
Add new generate_video_upload_link api.
azarembok Nov 3, 2020
77c993e
Merge pull request #25513 from edx/azarembok/upload-video-api
azarembok Nov 5, 2020
857f1d0
Merge pull request #25473 from edx/github-actions-mysqldbdump/69a6338…
Nov 5, 2020
bfa8f71
Update routing config #25419
iamsobanjaved Nov 5, 2020
e19f6c2
Merge pull request #25531 from regisb/regisb/completion-requirement-c…
robrap Nov 5, 2020
061d5d8
Merge pull request #25529 from regisb/regisb/better-waffle-deprecatio…
robrap Nov 5, 2020
f2d4e0c
AA-408: Treat group_access as inheritable in gating transformer
mikix Nov 2, 2020
5a2ea1f
Revert "Update routing config"
iamsobanjaved Nov 5, 2020
b0cbe36
Merge pull request #25533 from edx/revert-25419-iamsobanjaved/routing…
iamsobanjaved Nov 5, 2020
a900cec
MST-338 Update other outstanding links to old IDV into new IDV flow (…
schenedx Nov 6, 2020
0c405d3
ENT-3509 Upgrade edx-enterprise to version 3.10.4 (#25535)
zamanafzal Nov 6, 2020
19ff82a
Improve waffle_utils tests to not rely on internal API
regisb Nov 6, 2020
8be2283
Added next and cours_id params in register endpoint
Oct 21, 2020
2d46f12
Upgrade codejail from 3.1.0 to 3.1.1 for improved logging (#25532)
kdmccormick Nov 6, 2020
0d92365
Merge pull request #25398 from edx/aehsan/van-6/added_params_in_regis…
Nov 6, 2020
fe9395b
Merge pull request #25538 from regisb/regisb/improve-waffle-tests
robrap Nov 6, 2020
b2ba363
Merge pull request #25503 from edx/mikix/parent-access
mikix Nov 6, 2020
04640bd
Get last visited block id as user staus with version v1 (#25498)
jawad-khan Nov 6, 2020
d96deda
Merge pull request #25511 from mitodl/asadiqbal08/sysadmin-deprecatio…
nedbat Nov 6, 2020
c74b623
Fixing code-annotations (#25539)
jinder1s Nov 6, 2020
24ee08d
Squash experiments DeprecatedEdxPlatformImportWarning
jramnai Nov 7, 2020
51610e1
Adds error message for logistration MFE.
adeelkhan Nov 3, 2020
eec8200
Merge pull request #25507 from edx/adeel/van_105_adding_error_handlin…
adeelkhan Nov 9, 2020
7c97467
Remove maxlength attribute from register password field.
waheedahmed Nov 9, 2020
39a2273
"Update routing config" (#25536)
awais786 Nov 9, 2020
d05c250
Merge pull request #25474 from mitodl/umar/sysadmin-190
Nov 9, 2020
6c07fd0
Merge pull request #25521 from mitodl/arslanashraf/193-sysadmin-auth-…
Nov 9, 2020
07b0b71
Upgrade codejail from 3.1.1 to 3.1.3 for logging fix
kdmccormick Nov 7, 2020
688d3e7
Add logging slug to /debug/run_python safe exec call
kdmccormick Nov 7, 2020
bad30a1
Upgrade edx-completion and fix corresponding unit tests
regisb Nov 9, 2020
e5e3fcd
[REV-1262] Skip enrolling already enrolled users on changes to the us…
jhan217 Nov 9, 2020
fa846b0
update edx-enterprise to latest release
taliaedX Nov 9, 2020
c1fe3c3
Revert ""Update routing config" (#25536)" (#25549)
iamsobanjaved Nov 9, 2020
37353bf
Merge pull request #25546 from regisb/regisb/fix-override-in-tests
robrap Nov 9, 2020
5f69024
Updating Python Requirements
edx-requirements-bot Nov 10, 2020
2b683eb
Merge pull request #25554 from edx/jenkins/upgrade-python-requirement…
UsamaSadiq Nov 10, 2020
a62c5da
Merge pull request #25542 from jramnai/squash-DeprecatedEdxPlatformIm…
nedbat Nov 10, 2020
151bd13
Use full names for common.djangoapps imports; warn when using old sty…
kdmccormick Nov 10, 2020
cd3a1e3
upgrade ora and remove temporary pin (#25512)
jansenk Nov 10, 2020
08ab6e0
Fix import of common.djangoapps.util.date_utils (#25558)
kdmccormick Nov 10, 2020
3342524
Update IDVerificationAttempt to use expiration_date field
bseverino Oct 30, 2020
e1b85ce
Merge pull request #25548 from edx/trhodes/enterprise-11092020
taliaedX Nov 10, 2020
c49aa3a
Updating Bokchoy testing database cache (#25559)
edx-cache-uploader-bot Nov 10, 2020
0f6d94d
Merge pull request #25500 from edx/bseverino/idv-expiration
bseverino Nov 10, 2020
db4c3b1
Revert "Revert ""Update routing config" (#25536)" (#25549)" (#25553)
awais786 Nov 10, 2020
11f1347
AA-422: Ensure learners are not receiving updates after course end
Dillon-Dumesnil Nov 10, 2020
7201edb
Revert "Update routing config" (#25536)" (#25549)" (#25553)" (#25561)
awais786 Nov 10, 2020
82e8592
Revert "Set expiration_date field in IDVerificationAttempt model"
bseverino Nov 10, 2020
8824a13
Merge pull request #25562 from edx/ddumesnil/no-updates-after-end-aa-422
Dillon-Dumesnil Nov 10, 2020
2e629c9
Merge pull request #25564 from edx/revert-25500-bseverino/idv-expiration
bseverino Nov 10, 2020
db32c28
Updating Python Requirements (#25563)
edx-requirements-bot Nov 10, 2020
56d7ff8
Set expiration_date field in IDVerificationAttempt model
bseverino Nov 10, 2020
7373918
Undo renames of common.djangoapps tasks (#25566)
kdmccormick Nov 10, 2020
d876a79
Merge pull request #25322 from aulasneo/BTR-15
felipemontoya Nov 10, 2020
3fb758a
Updating Bokchoy testing database cache (#25560)
edx-cache-uploader-bot Nov 11, 2020
785b048
Updated edx-enterprise version and only set user language preference …
saleem-latif Nov 11, 2020
0194be2
geoip2: update maxmind geolite country database
Nov 11, 2020
9c22e31
Updating Python Requirements (#25578)
edx-requirements-bot Nov 12, 2020
1858e28
Merge pull request #25576 from edx/saleem-latif/ENT-3680
saleem-latif Nov 12, 2020
9551b23
[MICROBA-721] Updates the notify_credentials job to run over new window
Nov 10, 2020
60cab77
Merge pull request #25568 from edx/bseverino/idv-expiration
bseverino Nov 12, 2020
b3b4038
This is Koa
Nov 12, 2020
822f922
Transifex projects for Koa
Nov 12, 2020
1424075
Squash a regex warning
Nov 16, 2020
74f2fd2
MICROBA-666 Add migration for executive education mode (#25631)
crice100 Nov 18, 2020
b0bc2c2
[Koa Backport] Fix linting as it relates to import_shims, and vice ve…
kdmccormick Nov 30, 2020
3489e17
Remove a deprecation warning.
feanil Nov 13, 2020
7a4e9a3
Squashing some naive datetime warnings
sarina Nov 17, 2020
558c96e
Fix imports, remove unused import
0x29a Nov 19, 2020
c637540
Replace 'multi_db = True' with 'databases = {alias for alias in conne…
0x29a Nov 19, 2020
186a331
Merge pull request #25714 from open-craft/0x29a/cherry-pick-warning-s…
nedbat Dec 1, 2020
5a5fd86
Catches BlockStructureNotFound raised when clearing course from cache
nizarmah Nov 7, 2020
a5d924d
Merge pull request #25728 from open-craft/0x29a/catch_blockstructure_…
nedbat Dec 2, 2020
360c210
Remove unnecessary and misleading data-rel attributes
Dec 1, 2020
c2fd7b1
IM security fixes
Ali-D-Akbar Dec 7, 2020
455bde3
Pin the third-party random2 library
Dec 7, 2020
1d6009d
Update LTI XBlock to 1.3 Grading version
Dec 7, 2020
f4b159e
Merge pull request #25790 from edx/IM/backport-koa-security-fixes
nedbat Dec 8, 2020
47d51c9
[BTR-38] [BB-3269] Add openassessmnet url to CMS
farhaanbukhsh Dec 3, 2020
5693909
Get ora2 fix for "Filesystem backend in ORA is not able to handle ima…
Dec 8, 2020
220d646
New LOGIN_ISSUE_SUPPORT_LINK setting
Dec 3, 2020
134d68d
In the LMS, bookmarks associated to deleted units are not deleted
cmltaWt0 Oct 20, 2020
9f92605
Incident Management security fixes (#25834)
Ali-D-Akbar Dec 10, 2020
928fe14
Enforce a Celery singleton across cms and lms by using shared module …
timmc-edx Dec 10, 2020
7f60fcd
Replace outdated 16.04 link with link to install options (#25875)
kdmccormick Dec 14, 2020
401d6a5
Update the Open edX logo urls (#25898)
nedbat Dec 16, 2020
7f58bcb
xss security fixes
Ali-D-Akbar Jan 4, 2021
d84e4a3
Configure Jenkins workers with a release-specific label (#25862)
nedbat Jan 4, 2021
4abb0f8
Merge pull request #25974 from edx/IM/backport-security-fixes-3
Ali-D-Akbar Jan 5, 2021
835c508
Incident Management Security Fixes 4
Ali-D-Akbar Jan 6, 2021
fa8d393
Translations
Jan 7, 2021
daf69dc
Merge pull request #26029 from edx/IM/backport-security-fixes-4
Ali-D-Akbar Jan 11, 2021
a8e7b98
Incident Management Security Fixes 5
Ali-D-Akbar Jan 12, 2021
0930426
Include security patch for pinning JWT signature algorithm in apple-i…
timmc-edx Jan 13, 2021
93d38e8
Error incase of disabled user social login
AhtishamShahid Jul 16, 2020
8f63b45
Merge pull request #26112 from edx/IM/backport-security-fixes-5
nedbat Jan 19, 2021
5afe578
Incident Management Security Release 6
Ali-D-Akbar Jan 26, 2021
3c3e35e
Merge pull request #26253 from edx/IM/backport-security-release-6
nedbat Jan 29, 2021
a8edfa9
Incident Management Security Fixes 7
Ali-D-Akbar Feb 1, 2021
e723a9f
chore: upgrade Django to 2.2.18
Feb 2, 2021
a6f0f2c
Merge pull request #26358 from edx/IM/backport-security-fixes-7
Ali-D-Akbar Feb 3, 2021
97afc00
fix: messages shouldn't name edx.org
Feb 1, 2021
603eabf
Misuse of urljoin in Gradebook URL from Instructor Panel
Jan 12, 2021
cba2c84
Incident Management Security Fixes 8
Ali-D-Akbar Feb 8, 2021
9b97b7d
Merge pull request #26432 from edx/IM/backport-security-fixes-8
Ali-D-Akbar Feb 8, 2021
08f4603
Fix TypeError during transcript upload to S3
regisb Aug 19, 2020
f132471
fix(notes): XSS vector for a11y text attached to notes editor
Feb 9, 2021
a4369d3
Incident Management Security Fixes 9
Ali-D-Akbar Feb 17, 2021
9d4b0ee
Merge pull request #26592 from edx/IM/backport-security-fixes-9
Ali-D-Akbar Feb 17, 2021
327ebbd
chore: upgrade Django to 2.2.19
nedbat Feb 19, 2021
2c332e8
Fix flexbox not wrapping on mobile devices in preview menu (#26119)
aayushagrawal9 Feb 19, 2021
7f21156
fix: remove absolute positioning to allow RTL scrolling (#26098)
gabor-boros Feb 24, 2021
86ad473
Logo Swap & Config for serving assets from cdn.
NeOneSoft Mar 18, 2021
da2ff79
fix: don't duplicate text in forum notification email (#27123)
Ali-D-Akbar Mar 26, 2021
f3dca8e
fix: Backport py2neo fix workaround (#27186)
BbrSofiane Mar 30, 2021
979b9e9
SE-3243 Remove injected edxnotes from AboutBlock (#24930) (#27198)
cmltaWt0 Apr 1, 2021
b8a0f18
fix: Incident Security Fixes 10
azanbinzahid Apr 2, 2021
90c14a2
chore: upgrade Django to 2.2.20
nedbat Apr 6, 2021
c055984
Fix the theme compilation issue since juniper (#24990)
pkulkark Dec 11, 2020
05b1ae5
Adds clean-js jake command to JakePackage and updates building instru…
nizarmah Jan 11, 2021
83da299
Add progress_video event and update tests (#25038)
toxinu Oct 1, 2020
6685732
Merge pull request #25045 from open-craft/gabor/expose-banner-image-url
Nov 17, 2020
54e3ea1
Merge pull request #25338 from open-craft/nizar/xframe_allow_whitelist
Dec 18, 2020
72927db
Adds grade cutoffs to gradebook grading information
nizarmah Jan 5, 2021
b2be77d
Adds support for enabling custom tinymce plugins in Studio's HTML edi…
nizarmah Jan 11, 2021
09636b8
Django app to allow user retirement via API (#25800)
pkulkark Dec 8, 2020
45e7f79
Adds waffle switch to enable third party auth email association (#25935)
nizarmah Dec 26, 2020
80b3084
Updates tpa email association waffle switch to support edx-toggles=1.1.1
nizarmah Feb 9, 2021
c102e41
(BB-1389) Update enrollment serializer and Add problem submission his…
xirdneh Jul 3, 2019
48b4a6c
Unhide student-generated certificates toggle
samuelallan72 Apr 16, 2020
3f3f4fa
Add ar-sa locale (#309)
viadanna Feb 2, 2021
70a5c57
Stop rendering Visibility and Move utton on libraries
Mar 2, 2021
a3d996f
Revert "Stop rendering Visibility and Move utton on libraries"
Mar 23, 2021
0136444
fix: Stop rendering Visibility and Move buttons on libraries 2
jansenk Mar 24, 2021
b324d99
Add missing context platform_name and contact_mailing_address. And pa…
Mar 28, 2021
73cf4e9
Use PR branch for xblock-lti-consumer
pkulkark Mar 25, 2021
2ca69ec
Remove priority from static main tabs to make tab sorting function wo…
Arti3DPlayer Apr 12, 2021
7c4f50f
Revert "Logo Swap & Config for serving assets from cdn."
0x29a Apr 22, 2021
f29488b
xss security fixes
Ali-D-Akbar Apr 19, 2021
2143f84
[FAL-1813] fix: codejail issue when using matplotlib (#343)
pomegranited Apr 28, 2021
b0054b9
Revert changes done by !256 and !266
toxinu Apr 19, 2021
ca4dd72
Merge pull request #341 from open-craft/toxinu/revert-se-3248
toxinu Apr 30, 2021
b6b08de
fix: fix typo that prevented video completion working as intended
mikix Apr 2, 2021
31905d0
[SE-4101] fix: address VisibleBlocks caching race condition (#27359) …
gabor-boros May 5, 2021
ac0d6f6
BB-3954 Add toggle for enrollment behavior (#351)
farhaanbukhsh May 13, 2021
5ca2ce2
[BB-3622] feat:Restrict user create course (#319) (#352)
farhaanbukhsh May 13, 2021
344dd05
fix: update the xblock-lti-consumer commit
pkulkark May 26, 2021
dc4d5e9
Added new setting CERTIFICATE_DATE_FORMAT for easy customization of (…
May 28, 2021
ad129b9
fix: Produce grade report when subsections have future start dates
May 5, 2021
b10e2dd
Revert "Unhide student-generated certificates toggle"
samuelallan72 Jun 3, 2021
0819520
chore: update Arabic translations
Jun 3, 2021
b2e0d62
Merge pull request #358 from open-craft/shimulch/bb-4218-koa
giovannicimolin Jun 4, 2021
4b7291d
Merge pull request #356 from open-craft/samuel/revert-certificates-to…
samuelallan72 Jun 5, 2021
870852c
fix:Fix function call to check MFE (#359)
farhaanbukhsh Jun 8, 2021
f58229c
fix: don't cache ajax request
0x29a Jun 18, 2021
0df896d
Merge pull request #363 from open-craft/0x29a/bb4385/fix_moving_back_…
0x29a Jun 22, 2021
eba631e
feat: add site language config
dgamanenko Sep 13, 2017
ed0ae2e
Revert "[FAL-1813] fix: codejail issue when using matplotlib (#343)" …
pomegranited Jun 24, 2021
5aeddb9
Update celery routing for celery 4+ (#25567)
iamsobanjaved Dec 16, 2020
435f802
fix: add missing set_code_owner_attribute imports
gabor-boros May 20, 2021
54a3a5c
chore: bump edx-django-utils to 3.12.0
gabor-boros May 20, 2021
9f61f3e
[SE-4482] Allow delete course content in Studio only for admin users …
Jun 27, 2021
bc47957
fix: Password reset page throwing not found error (#364)
farhaanbukhsh Jun 28, 2021
0ff2c84
fix: change buttons in wiki modal to anchor tags
arjunsinghy96 Jun 28, 2021
1f5d70f
Merge pull request #368 from open-craft/arjun/bb-4360-wiki
arjunsinghy96 Jun 28, 2021
b8fecc1
fix: use high priority queue for celery heartbeat check
Jun 24, 2021
94fba05
fix: prevent invalidation of allowlisted certificates
Agrendalath Jul 5, 2021
a2ee289
Merge pull request #367 from open-craft/jill/celery-fixes-koa.3
pomegranited Jul 8, 2021
857e586
feat: add celery beat configuration (#371)
gabor-boros Jul 14, 2021
f282a26
feat: add custom task kwargs (#375)
gabor-boros Jul 23, 2021
6386407
feat: Add REST endpoints for problem response report generation that …
xitij2000 Jul 30, 2021
45e23eb
fix: discussion xss fix
awaisdar001 Jul 27, 2021
dc56843
fix: koa compatible version 2.4 for lti-consumer-xblock (#383)
Aug 9, 2021
9612bad
fix: update lti-consumer-xblock to new commit (#384)
pkulkark Aug 9, 2021
dd042d2
fix: bump up moment version (#385)
Aug 17, 2021
525c198
fix: update lxml parser for celery tasks to be more secure
Aug 3, 2021
c6bfd53
[BB-3954] Backport: Add toggle to redirect user to the login page on …
Aug 20, 2021
a26bb85
FAL-2248: Monkey-patch django db introspection to avoid perf issues.
mtyaka Aug 12, 2021
213b1dc
Merge pull request #387 from open-craft/mtyaka/FAL-2248-monkey-patch-…
mtyaka Aug 23, 2021
39440bf
fix: xblock-poll's celery tasks were not registered (#28019) (#391)
pomegranited Aug 26, 2021
d15f0bf
Fix RTL issue with capa problems.
mtyaka Aug 26, 2021
e7b63e3
Update 'View Course' arabic translation.
mtyaka Sep 1, 2021
19f3ef4
Merge pull request #28486 from open-craft/shimulch/fix-duplicate-arab…
Sep 1, 2021
8cda9d8
feat: options for excluding courses from search
ha-D Aug 20, 2021
a162fcc
Merge pull request #392 from open-craft/mtyaka/FAL-2358-fix-capa-rtl
mtyaka Sep 6, 2021
00c5165
Merge pull request #396 from open-craft/mtyaka/FAL-2358-update-arabic…
mtyaka Sep 6, 2021
04dbfa3
[FAL-2030] Updates kombu package to support multi-tenant redis authen…
pomegranited Sep 10, 2021
9f57dc7
Revert "[FAL-2030] Updates kombu package to support multi-tenant redi…
nizarmah Sep 13, 2021
85884f3
fix: update lti-consumer-xblock to 2.10.1 (#400)
nizarmah Sep 16, 2021
9516b3d
REMOVE default files (snippets)
pedrovgp Sep 14, 2021
d78d5cf
ADD html snippets from esme
pedrovgp Sep 13, 2021
34ff696
ADD esme custom css as separate file
pedrovgp Sep 20, 2021
8893cd2
Merge pull request #403 from open-craft/pedrovgp/se4781-add-custom-ht…
pedrovgp Sep 21, 2021
1a19a5f
Revert "Pedrovgp/se4781 add custom html templates in studio"
pedrovgp Sep 21, 2021
a9e9edb
Merge pull request #404 from open-craft/revert-403-pedrovgp/se4781-ad…
pedrovgp Sep 21, 2021
84f7258
feat: adds CELERY_BROKER_TRANSPORT_OPTIONS (#410)
gabor-boros Oct 1, 2021
b98bcd0
Fix use a registration field order when using a registration extensio…
gabor-boros Oct 1, 2021
a85f2d0
feat: grant course/library creation rights by organization (#26616)
farhaanbukhsh Oct 4, 2021
5b455de
feat: Add course-wide custom scripts (#424)
gabor-boros Oct 4, 2021
7013c2c
Revert "feat: grant course/library creation rights by organization (#…
Agrendalath Oct 14, 2021
595249d
feat: Compile JS translations for Arabic
giovannicimolin Oct 18, 2021
027c389
Merge pull request #432 from open-craft/giovanni/bb-4977-compile-ar-t…
giovannicimolin Oct 18, 2021
c996623
feat: add CCX ID to generated filename prefixes (#27028)
gabor-boros May 25, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
30 changes: 0 additions & 30 deletions .annotation_safe_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,36 +131,6 @@ djcelery.WorkerState:
edx_oauth2_provider.TrustedClient:
".. no_pii:": "No PII"

# Via Proctoring
edx_proctoring.ProctoredExam:
".. no_pii:": "No PII"
edx_proctoring.ProctoredExamReviewPolicy:
".. no_pii:": "No PII"
edx_proctoring.ProctoredExamReviewPolicyHistory:
".. no_pii:": "No PII"
edx_proctoring.ProctoredExamSoftwareSecureComment:
".. no_pii:": "No PII"
edx_proctoring.ProctoredExamSoftwareSecureReview:
".. pii:": "Proctored exam review feedback from Software Secure, contains video_url. Retained for record keeping."
".. pii_types:": video
".. pii_retirement:": retained
edx_proctoring.ProctoredExamSoftwareSecureReviewHistory:
".. pii:": "Proctored exam review feedback from Software Secure, contains video_url. Retained for record keeping."
".. pii_types:": video
".. pii_retirement:": retained
edx_proctoring.ProctoredExamStudentAllowance:
".. no_pii:": "No PII"
edx_proctoring.ProctoredExamStudentAllowanceHistory:
".. no_pii:": "No PII"
edx_proctoring.ProctoredExamStudentAttempt:
".. pii:": "Tracks attempts by a user to take a proctored exam. Contains student_name. Retained for record keeping."
".. pii_types:": name
".. pii_retirement:": retained
edx_proctoring.ProctoredExamStudentAttemptHistory:
".. pii:": "Tracks attempts by a user to take a proctored exam. Contains student_name. Retained for record keeping."
".. pii_types:": name
".. pii_retirement:": retained

# Via VAL
edxval.CourseVideo:
".. no_pii:": "No PII"
Expand Down
3 changes: 2 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# .coveragerc for edx-platform
[run]
data_file = reports/.coverage
data_file = reports/${TEST_SUITE}.coverage
source =
cms
common/djangoapps
Expand Down Expand Up @@ -30,6 +30,7 @@ omit =

concurrency=multiprocessing
parallel = true
relative_files = true

[report]
ignore_errors = True
Expand Down
151 changes: 151 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
# .dockerignore for edx-platform.
# There's a lot here, please try to keep it organized.

### Files that are not needed in the docker file

/test_root/
.git

### Files private to developers

# Files that should be git-ignored, but are hand-edited or otherwise valued,
# and so should not be destroyed by "make clean".
# start-noclean
requirements/private.txt
requirements/edx/private.in
requirements/edx/private.txt
lms/envs/private.py
cms/envs/private.py
# end-noclean

### Python artifacts
**/*.pyc

### Editor and IDE artifacts
**/*~
**/*.swp
**/*.orig
**/nbproject
**/.idea/
**/.redcar/
**/codekit-config.json
**/.pycharm_helpers/
**/_mac/*
**/IntelliLang.xml
**/conda_packages.xml
**/databaseSettings.xml
**/diff.xml
**/debugger.xml
**/editor.xml
**/ide.general.xml
**/inspection/Default.xml
**/other.xml
**/packages.xml
**/web-browsers.xml

### NFS artifacts
**/.nfs*

### OS X artifacts
**/*.DS_Store
**/.AppleDouble
**/:2e_*
**/:2e#

### Internationalization artifacts
**/*.mo
**/*.po
**/*.prob
**/*.dup
!**/django.po
!**/django.mo
!**/djangojs.po
!**/djangojs.mo
conf/locale/en/LC_MESSAGES/*.mo
conf/locale/fake*/LC_MESSAGES/*.po
conf/locale/fake*/LC_MESSAGES/*.mo

### Testing artifacts
**/.testids/
**/.noseids
**/nosetests.xml
**/.cache/
**/.coverage
**/.coverage.*
**/coverage.xml
**/cover/
**/cover_html/
**/reports/
**/jscover.log
**/jscover.log.*
**/.pytest_cache/
**/pytest_task*.txt
**/.tddium*
common/test/data/test_unicode/static/
test_root/courses/
test_root/data/test_bare.git/
test_root/export_course_repos/
test_root/paver_logs/
test_root/uploads/
**/django-pyfs
**/.tox/
common/test/db_cache/bok_choy_*.yaml
common/test/data/badges/*.png

### Installation artifacts
**/*.egg-info
**/.pip_download_cache/
**/.prereqs_cache
**/.vagrant/
**/node_modules
**/bin/

### Static assets pipeline artifacts
**/*.scssc
lms/static/css/
lms/static/certificates/css/
cms/static/css/
common/static/common/js/vendor/
common/static/common/css/vendor/
common/static/bundles
**/webpack-stats.json

### Styling generated from templates
lms/static/sass/*.css
lms/static/sass/*.css.map
lms/static/certificates/sass/*.css
lms/static/themed_sass/
cms/static/css/
cms/static/sass/*.css
cms/static/sass/*.css.map
cms/static/themed_sass/
themes/**/css

### Logging artifacts
**/log/
**/logs
**/chromedriver.log
**/ghostdriver.log

### Celery artifacts ###
**/celerybeat-schedule

### Unknown artifacts
**/database.sqlite
**/courseware/static/js/mathjax/*
**/flushdb.sh
**/build
/src/
\#*\#
**/.env/
openedx/core/djangoapps/django_comment_common/comment_client/python
**/autodeploy.properties
**/.ws_migrations_complete
**/dist
**/*.bak

# Visual Studio Code
**/.vscode

# Locally generated PII reports
**/pii_report
62 changes: 31 additions & 31 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
# This does not cover all the code in edx-platform but it's a good start.

# Core
common/djangoapps/student/ @edx/platform-core
common/djangoapps/third_party_auth/ @edx/platform-authn
common/lib/xmodule/xmodule/ @edx/platform-core
lms/djangoapps/course_api/blocks @edx/platform-core
lms/djangoapps/courseware/ @edx/platform-core
lms/djangoapps/grades/ @edx/platform-grades
lms/djangoapps/instructor/ @edx/platform-core
lms/djangoapps/instructor_task/ @edx/platform-core
lms/djangoapps/mobile_api/ @edx/platform-mobile
openedx/core/djangoapps/contentserver/ @edx/platform-core
openedx/core/djangoapps/heartbeat/ @edx/platform-core
openedx/core/djangoapps/oauth_dispatch @edx/platform-authn
openedx/core/djangoapps/user_api/ @edx/platform-authn
openedx/core/djangoapps/user_authn/ @edx/platform-authn
openedx/features/course_experience/ @edx/platform-courseware
common/djangoapps/student/
common/djangoapps/third_party_auth/
common/lib/xmodule/xmodule/
lms/djangoapps/course_api/blocks
lms/djangoapps/courseware/
lms/djangoapps/grades/
lms/djangoapps/instructor/
lms/djangoapps/instructor_task/
lms/djangoapps/mobile_api/
openedx/core/djangoapps/contentserver/
openedx/core/djangoapps/heartbeat/
openedx/core/djangoapps/oauth_dispatch
openedx/core/djangoapps/user_api/
openedx/core/djangoapps/user_authn/
openedx/features/course_experience/

# Core Extensions
common/lib/xmodule/xmodule/capa_module.py @edx/platform-core-extensions
common/lib/xmodule/xmodule/html_module.py @edx/platform-core-extensions
common/lib/xmodule/xmodule/video_module @edx/platform-core-extensions
lms/djangoapps/discussion/ @edx/platform-core-extensions
lms/djangoapps/edxnotes @edx/platform-core-extensions
# Core Extensions
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/video_module
lms/djangoapps/discussion/
lms/djangoapps/edxnotes

# Analytics
common/djangoapps/track/ @edx/edx-data-engineering
common/djangoapps/track/ @edx/edx-data-engineering

# Credentials
lms/djangoapps/certificates/ @edx/platform-credentials
lms/djangoapps/certificates/ @edx/platform-credentials

# Discovery
common/djangoapps/course_modes/ @edx/platform-discovery
common/djangoapps/enrollment/ @edx/platform-discovery
lms/djangoapps/commerce/ @edx/ecommerce
lms/djangoapps/experiments/ @edx/rev-team
lms/djangoapps/learner_dashboard/ @edx/platform-discovery
openedx/features/content_type_gating/ @edx/rev-team
openedx/features/course_duration_limits/ @edx/rev-team
openedx/features/discounts/ @edx/rev-team
common/djangoapps/course_modes/ @edx/platform-discovery
common/djangoapps/enrollment/ @edx/platform-discovery
lms/djangoapps/commerce/ @edx/rev-team
lms/djangoapps/experiments/ @edx/rev-team
lms/djangoapps/learner_dashboard/ @edx/platform-discovery
openedx/features/content_type_gating/ @edx/rev-team
openedx/features/course_duration_limits/ @edx/rev-team
openedx/features/discounts/ @edx/rev-team
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"schedule:weekdays",
":preserveSemverRanges"
],
"prConcurrentLimit": 2,
"prConcurrentLimit": 5,
"includePaths": [
"package.json"
]
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/docker-compose.yml.mysqldbdump
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
version: '3'
services:
mysql:
image: mysql:5.6
container_name: edx.devstack.mysql
ports:
- '3306:3306'
environment:
MYSQL_ROOT_PASSWORD: ""
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
volumes:
- ./init:/docker-entrypoint-initdb.d
healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
timeout: 20s
retries: 10
edxapp:
image: edxops/edxapp:latest
command: bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_db'
volumes:
- ../../:/edx/app/edxapp/edx-platform
depends_on:
mysql:
condition: service_healthy
22 changes: 22 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Push Docker Images

on:
push:
branches:
- master
jobs:
# Push image to GitHub Packages.
# See also https://docs.docker.com/docker-hub/builds/
push:
runs-on: ubuntu-latest
if: github.event_name == 'push'

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Build and Push docker image
env:
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
run : make docker_push
3 changes: 3 additions & 0 deletions .github/workflows/init/01.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CREATE DATABASE IF NOT EXISTS `edxapp`;
CREATE DATABASE IF NOT EXISTS `edxapp_csmh`;
GRANT ALL PRIVILEGES ON *.* TO 'edxapp001'@'%' IDENTIFIED BY 'password';
23 changes: 23 additions & 0 deletions .github/workflows/mysqldbdump.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: mysqldbdump
on:
schedule:
- cron: '0 8 * * *'
jobs:
mysqldbdump:
name: mysqldbdump
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
- name: Migrate
run: docker-compose -f ./.github/workflows/docker-compose.yml.mysqldbdump up -d
- name: Wait for migration to complete
uses: jakejarvis/wait-action@master
with:
time: '900s'
- name: Dump database
run: docker exec -i edx.devstack.mysql57 mysqldump -u'edxapp001' -p'password' --skip-dump-date edxapp > edxapp.sql
- name: Commit dump file to repo.
run: ./.github/workflows/mysqldbdump_pr.sh
env:
GH_ACCESS_TOKEN: ${{ secrets.EDX_DEPLOYMENT_GH_TOKEN }}
Loading