Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,443 Commits 1 Branch 0 Tags
e850fd072ef0c8a30287afb83f03fc36039aa032
Commit Graph

56443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HammadAhmadWaqas
e850fd072e updating edx-enterprise==3.12.1 2020-11-18 16:30:11 +05:00
Saleem Latif
618417ccef Merge pull request #25620 from edx/saleem-latif/ENT-3680-fix-sandbox-build 
ENT-3702: Fix sandbox builds, because of signal chains, UserProfile table must be present before adding a User
 2020-11-18 14:34:56 +05:00
Awais Jibran
1396a6de35 Merge pull request #25621 from edx/aj/branding/update-brand-edx-org-1.1.2 
Update @edx/brand-edx.org to v1.1.2
 2020-11-18 14:23:38 +05:00
Awais Jibran
69605cb0e1 The new theme is in v1.1.2 of the brand-edx.org package. It looks like the edx-platfrom is using older version. let's update update to the latest version and teams should work from there. 2020-11-18 13:32:13 +05:00
Awais Jibran
28311e3aa5 Merge pull request #25610 from edx/aj/update-progress-page-border 
Branding: Update boder-left on Progress page
 2020-11-18 13:26:52 +05:00
Usama Sadiq
a45e5b8d42 Merge pull request #25612 from edx/testeng/bokchoy_auto_cache_update_b0e49057a7781b716f3ffe2dfc9f3674f3f8fa53 
Bokchoy Testing DB Cache update
 2020-11-18 13:21:48 +05:00
Usama Sadiq
81fce328fe Merge pull request #25619 from edx/jenkins/upgrade-python-requirements-9ae8202 
Python Requirements Update
 2020-11-18 13:21:34 +05:00
Saleem Latif
c0de670c5b Fix sandboax builds, because of signal chains, UserProfile table must be predent before adding a User 2020-11-18 12:55:40 +05:00
edX requirements bot
eabb3cdc2b Updating Python Requirements 2020-11-18 00:00:30 -05:00
Robert Raposa
9ae82024fc Merge pull request #25584 from edx/robrap/ARCHBOM-1260-code-owner-decorator 
ARCHBOM-1260: set code_owner for celery tasks
 2020-11-17 19:32:59 -05:00
Sarina Canelake
5a0e93b676 Merge pull request #25571 from edx/sarina/DEPR-48 
DEPR-48 Remove CourseTalk & Course Reviews integrations
 2020-11-17 16:40:41 -05:00
Zachary Hancock
89fd50545f Update edx-proctoring to 2.4.9 (#25616) 2020-11-17 16:13:32 -05:00
Robert Raposa
8eef18710d set code_owner for celery tasks 
ARCHBOM-1260

Co-authored-by: Tim McCormack <tmccormack@edx.org>
 2020-11-17 15:33:33 -05:00
Justin Hynes
93dbdcc2b7 Merge pull request #25614 from edx/jhynes/microba-714_fix-log-msg 
MB-714 | Fix log message when generating certificates
 2020-11-17 14:51:46 -05:00
Justin Hynes
dcfa7ea72c MB-714 | Fix log message when generating certificates 
[MB-714]
- While investigating a certificate generation issue I happened to notice a log statement whose arguments were backwards
 2020-11-17 14:15:12 -05:00
Diana Huang
266e27ff80 Merge pull request #25596 from edx/diana/edx-search-deploy 
Add changes to support ES7 and edx-search 2.0 back into the tree.
 2020-11-17 13:56:00 -05:00
Diana Huang
f2b322f245 Update version of edx-search. 2020-11-17 13:23:13 -05:00
Diana Huang
65d0c11591 Catch individual errors instead of failing the entire job for course 
indexing.
 2020-11-17 13:23:13 -05:00
Diana Huang
08c24ed0bf Add an increased timeout for courseware indexing. 2020-11-17 13:23:13 -05:00
Diana Huang
afeea75d9e Add changes to support ES7 and edx-search 2.0 back into the tree. 2020-11-17 13:23:13 -05:00
sarina
b8bd4f6310 DEPR-48 Remove CourseTalk integration & Course Reviews functionality 2020-11-17 13:11:54 -05:00
Fred Smith
8654feb7e1 Merge pull request #22966 from open-craft/samuel/remove-unused-defaults 
SE-1841 remove unused defaults
 2020-11-17 12:34:01 -05:00
edX cache uploader bot
fc18fbaa2a Updating Bokchoy testing database cache 2020-11-17 11:13:43 -05:00
David Ormsbee
6a55b833dc Merge pull request #25045 from open-craft/gabor/expose-banner-image-url 
[SE-3329] Expose banner image url in course API
 2020-11-17 11:08:18 -05:00
Albert (AJ) St. Aubin
70a82580fb Added data to the refresh endpoint for investigation. 
[MICROBA-585]

In support of an investigation into errors we are receiving for
JWT tokens we are adding some data to the JSON response on a token
refresh.
 2020-11-17 10:30:01 -05:00
Thomas Tracy
44187fb4d2 Fix courserun_key name to properly be picked up by snowflake (#25605) 2020-11-17 10:18:07 -05:00
Awais Jibran
21b29e8155 Update boder-left on Progress page 2020-11-17 20:10:15 +05:00
Usama Sadiq
07a01edbd5 Merge pull request #25607 from edx/jenkins/upgrade-python-requirements-6716d89 
Python Requirements Update
 2020-11-17 14:27:12 +05:00
edX requirements bot
f4e4dac965 Updating Python Requirements 2020-11-16 23:46:15 -05:00
Felipe Espinoza
6716d89e5d Merge PR #25343: Adding lynx to Dockerfile (#25343) 
It is required by edx-platform/openedx/core/lib/html_to_text.py
 2020-11-16 16:09:15 -08:00
Ned Batchelder
dc780049c0 Merge pull request #25604 from edx/nedbat/squash-regex-warning 
Squash a regex warning
 2020-11-16 15:01:09 -05:00
Carla Duarte
0ee7546379 Merge pull request #25541 from edx/ciduarte/AA-199 
AA-199: Surfacing program progress in courseware API
 2020-11-16 14:03:41 -05:00
Michael Terry
44b23fcc2c Merge pull request #25592 from edx/mikix/courseware-request-user 
When masquerading in courseware API, reset the request user
 2020-11-16 13:14:08 -05:00
Carla Duarte
9545ae8868 AA-199: Surfacing program progress in courseware API 2020-11-16 11:57:50 -05:00
Ned Batchelder
9a72148310 Squash a regex warning 
warnings.py:109 - /edx/app/edxapp/edx-platform/common/djangoapps/static_replace/__init__.py:76: DeprecationWarning: Flags not at the start of the expression '\n        (?x)       ' (truncated)
 2020-11-16 10:21:49 -05:00
Patrick Cockwell
586d6721e1 [BD-29] [TNL-7264] Add Milestones, Content Gating, and Special Exams Outline Processors (#24545) 
Extend the learning_sequences Course Outline API to handle milestones,
content gating, and special exams. This includes things like entrance exams
that would block other content from being accessible, and proctored exams
which would be unavailable until an exam is started.

Co-authored-by: Agrendalath <piotr@surowiec.it>
 2020-11-16 09:29:40 -05:00
edX requirements bot
73831539d9 Updating Python Requirements (#25599) 2020-11-16 14:36:17 +05:00
Saleem Latif
903ca33aff Merge pull request #25586 from edx/saleem-latif/ENT-3680-fix 
ENT-3680: Do not send email if profile not created, this code path is run as a result UserPreference save signal before profile is created.
 2020-11-16 11:59:07 +05:00
edX Transifex Bot
1ca41a7861 fix(i18n): update translations 2020-11-15 16:34:09 -05:00
Feanil Patel
472c608d67 Merge pull request #25595 from edx/feanil/fix_warning 
Remove a deprecation warning.
 2020-11-13 15:17:13 -05:00
Feanil Patel
ae81d3347f Remove a deprecation warning. 
DeprecationWarning: The unescape method is deprecated and will be
removed in 3.5, use html.unescape() instead.
 2020-11-13 14:40:52 -05:00
Diana Huang
eb79e167f5 Merge pull request #25593 from edx/diana/revert-search 
Revert "Merge pull request #25515 from edx/diana/edx-search"
 2020-11-13 14:28:10 -05:00
Usama Sadiq
617922b47a Merge pull request #25589 from edx/testeng/bokchoy_auto_cache_update_c9a505492b25cb4bb326f9cdc6aba945997da1df 
Bokchoy Testing DB Cache update
 2020-11-13 23:44:22 +05:00
Adam Stankiewicz
280d45dbc2 bump edx-enterprise to 3.12.0 (#25591) 2020-11-13 13:18:57 -05:00
Diana Huang
8d652e6a4b Revert "Merge pull request #25515 from edx/diana/edx-search" 
This reverts commit 9714d7412f, reversing
changes made to 5bc7c3996b.
 2020-11-13 13:16:16 -05:00
Diana Huang
9714d7412f Merge pull request #25515 from edx/diana/edx-search 
Update edx-platform to use Elasticsearch 7.
 2020-11-13 13:11:32 -05:00
Feanil Patel
5bc7c3996b Merge pull request #25590 from edx/feanil/update_ownership_mappings 
ARCHBOM-1369 Update ownership mappings.
 2020-11-13 13:07:19 -05:00
Michael Terry
7697b7dd46 When masquerading in courseware API, reset the request user 
It's important that request.user be set as the effective user,
because waffle flags and bits of code around the place look at it.

This should make masquerading more accurate to what the learner
sees.
 2020-11-13 12:58:18 -05:00
Feanil Patel
3cd9b8c41a Update ownership mappings. 
Add mapping from django apps to repos so we can look up owners by this repo
in the ownership mapping.
 2020-11-13 12:05:14 -05:00
edX cache uploader bot
19fba4f76d Updating Bokchoy testing database cache 2020-11-13 11:51:26 -05:00