Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usama Sadiq
b501f65bb4 Merge pull request #25870 from edx/usamasadiq/revert-celery-fork 
Revert celery fork from requirements
 2020-12-14 17:47:11 +05:00
arbi-bom
67b5f962c1 Ran Make Upgrade 2020-12-14 12:46:35 +05:00
usamasadiq
b5a4aeed79 Revert celery custom fork 2020-12-14 12:06:56 +05:00
Aleksandr Sobolev
7ac6d47382 Added student_view_user_state video Xblock handler 2020-12-14 04:05:38 +06:00
Usama Sadiq
07bb471e3d Merge pull request #25846 from edx/testeng/bokchoy_auto_cache_update_73d9efbe5f5ade6e54aaf067b2e88e65bd55755b 
Bokchoy Testing DB Cache update
 2020-12-13 15:30:07 +05:00
Nizar Mahmoud
6e0b304f65 Sets default X-Frame-Options for login and registration forms to X_FRAME_OPTIONS environment setting 2020-12-12 04:03:26 +03:00
Carla Duarte
573ec289dd AA-509: Dates widget link styling 2020-12-11 17:01:37 -05:00
Awais Jibran
0db4fb0ffe Merge pull request #25858 from edx/aj/branding/serve-assets-using-static-storage 
Serve assets using static storage
 2020-12-12 01:18:41 +05:00
Bianca Severino
25b007b8b8 Merge pull request #25864 from edx/bseverino/proctoring-bump 
Update edx-proctoring to 2.5.1
 2020-12-11 15:09:41 -05:00
Bianca Severino
a099cbb1e7 Update edx-proctoring to 2.5.1 2020-12-11 14:25:31 -05:00
Bianca Severino
d1549e5129 Merge pull request #25845 from edx/bseverino/idv-course-key-fix 
[MST-567] Encode course_id passed into IDV flow
 2020-12-11 13:16:30 -05:00
Robert Raposa
1118f2d049 Merge pull request #25861 from edx/robrap/update-features-toggle-annotations 
update FEATURES toggle annotation names
 2020-12-11 13:01:27 -05:00
Awais Jibran
c7fb27af07 Merge pull request #25860 from edx/aj/branding/update-brand-edx-org 
Update brand-edx.org to v1.3.3
 2020-12-11 21:28:22 +05:00
Robert Raposa
54044232b8 update FEATURES toggle annotation names 
Update toggle_name annotations from "XXX"
to "FEATURES['XXX']" to match the name
used by the toggle state endpoint so they
don't seem like two different toggles.
 2020-12-11 11:16:19 -05:00
Kyle McCormick
f5134e1201 Fix typo in backfill_orgs_and_org_courses dry-run call (#25859) 
Also, add test to confirm fix of typo.

TNL-7774
 2020-12-11 11:13:35 -05:00
Lael Birch
1584d9ab76 Merge pull request #25848 from edx/lbirch/rebrand 
Update edx-enterprise
 2020-12-11 11:07:43 -05:00
Awais Jibran
b63f210005 Update brand-edx.org 2020-12-11 20:37:13 +05:00
Awais Jibran
6a692e2ae2 Serve assets using static storage 2020-12-11 20:25:41 +05:00
Awais Qureshi
1dc7a2ac4a Merge pull request #25856 from edx/usamasadiq/pin-cryptography-version 
Usamasadiq/pin cryptography version
 2020-12-11 19:59:45 +05:00
Bianca Severino
2a4c26c367 Encode course_key passed into IDV flow 2020-12-11 09:38:38 -05:00
Jillian Vogel
511d6b975d SE-2010 Allows XBlocks to order columns for the Problem Response Report (#23109) 2020-12-11 09:37:26 -05:00
Pooja Kulkarni
e9cba8c282 Fix the theme compilation issue since juniper (#24990) 
Replaces the deprecated CachedFilesMixin with ManifestFilesMixin.
Also sorts xmodules and xblocks js bundles to make theme assets
compilation hashes consistent across different machines.
 2020-12-11 09:36:31 -05:00
Raul Gallegos
5279975483 [TNL-7771][LX-1409] sets blockstore values timeouts to avoid S3 links expiration (#25830) 2020-12-11 09:35:45 -05:00
Kyle McCormick
e49e3fa566 Constrain cryptography to <3.3 because Python 3.5 support was dropped (#25857) 
Although application code is on Python 3.8,
we are still using Python 3.5 to execute jailed code for now.

Run make upgrade.
 2020-12-11 09:03:53 -05:00
arbi-bom
069d9058d6 Ran Make Upgrade on branch 2020-12-11 18:18:57 +05:00
arbi-bom
0ea4630dcb Constrained Cryptography version 2020-12-11 18:18:57 +05:00
Tim McCormack
edeabc3faf Add --summary-format=json option to XSS linter (#25851) 
This will simplify updating of the linter thresholds file after XSS linter
violations are addressed.
 2020-12-11 12:34:04 +00:00
Usama Sadiq
79370d86cb Merge pull request #25852 from edx/jenkins/upgrade-python-requirements-3933435 
Python Requirements Update
 2020-12-11 12:21:45 +05:00
Ali Akbar
e02d7e66b8 Merge pull request #25849 from edx/aakbar/thresholds-IM-security-fixes-2 
Match the defined thresholds with the current violations on master
 2020-12-11 11:45:12 +05:00
edX requirements bot
d44a088224 Updating Python Requirements 2020-12-10 23:46:18 -05:00
Adeel Ehsan
39334358d2 Merge pull request #25847 from edx/aehsan/van-198/rebrand_the_saml_page 
applied rebranding to saml page
 2020-12-11 02:54:02 +05:00
Lael Birch
ba9a8e5380 Update edx-enterprise 
Rebrand of edx-enterprise pages
 2020-12-10 16:08:32 -05:00
Ali-D-Akbar
bd13b59254 match the defined thresholds with the current violations on master 2020-12-11 02:06:09 +05:00
adeelehsan
f6d743ad6b applied rebranding to saml page 2020-12-11 01:41:21 +05:00
edX cache uploader bot
3551f63f82 Updating Bokchoy testing database cache 2020-12-10 15:20:47 -05:00
Feanil Patel
2a6061b9da Merge pull request #25828 from edx/feanil/undo_celery_debug_reverts 
Feanil/undo celery debug reverts
 2020-12-10 15:16:09 -05:00
Feanil Patel
3d797e12df Run make upgrade. 2020-12-10 14:25:48 -05:00
Feanil Patel
1f564420a0 Remove temporary constraints. 
This should no longer be necessary now that we have found a root cause
fix for the issue. This was removed because it was causing the case
of celery tasks not getting registered to happen more often.

Undoing https://github.com/edx/edx-platform/pull/25787

Actual Fixes:
- https://github.com/edx/edx-platform/pull/25822
- https://github.com/edx/edx-platform/pull/25825
 2020-12-10 13:54:36 -05:00
Feanil Patel
cfc63722a5 Undo revert. 
This change was reverted along with the downgrade of super-csv because
it was believed that this change was causing issues with celery task
registration.

It was reverted in https://github.com/edx/edx-platform/pull/25762

The fix turned out to be something different and this and the
super-csv library should both be same to upgrade.  The library
upgrade will come in a follow-on make upgrade with some other
constraints that also need to be lifted.

Actual fix: https://github.com/edx/edx-platform/pull/25822
 2020-12-10 13:54:36 -05:00
Tim McCormack
0c57a02119 Enforce a Celery singleton across cms and lms by using shared module (#25840) 
This should prevent the issues we've seen recently where cms modules are
imported by the running lms process, resulting in two celery instances
being created and tasks intermittently being registered to the wrong
instance (and therefore effectively lost.)

In commit ab6bf348d4/PR #25822 we tried to ensure that only one or the
other of the instances was created by adding a startup check.
Unfortunately, there's an external shared library that refers directly
to the lms celery, causing a startup failure in cms, so we had to revert
it. Rather than waiting to fix that library, this commit collapses
the two instances together so that there is only ever one.
 2020-12-10 17:54:31 +00:00
Alexander J Sheehan
999b88ebbb Merge pull request #25709 from edx/asheehan-edx/ENT-3648-assessment-level-signals 
Adding signals and receivers for assessment level reporting
 2020-12-10 09:29:54 -08:00
taliaedX
fa58838480 Merge pull request #25826 from edx/trhodes/ent-3615-lms-config-option 
update edx-enterprise to include integrated channel api
 2020-12-10 11:59:22 -05:00
Feanil Patel
68e4732590 Merge pull request #25829 from edx/feanil/enable_history_panel 
Enable keeping some request history in the debug toolbar.
 2020-12-10 11:28:17 -05:00
Shimul Chowdhury
421e661a5f Added new setting CERTIFICATE_DATE_FORMAT for easy customization of 
certificate issued date
 2020-12-10 21:46:20 +06:00
Awais Jibran
e621563194 Merge pull request #25824 from edx/aj/branding/update-progress-page-base-font-size 
Update base fontsize on progress page
 2020-12-10 19:38:11 +05:00
Feanil Patel
267e3869a8 Merge pull request #25839 from edx/revert-25822-feanil/celery_worker_fix 
Revert "Only instantiate one celery app per process."
 2020-12-10 09:18:58 -05:00
Tim McCormack
a9bcf22169 Revert "Only instantiate one celery app per process." 2020-12-10 14:14:42 +00:00
Saad Yousaf
ec8aad0d2b Merge pull request #25791 from edx/saad/TNL-7741 
[TNL-7741] Add new header avatar asset.
 2020-12-10 15:45:43 +05:00
edx-pipeline-bot
9537dc80ba Merge pull request #25833 from edx/private_to_public_e209d89 
Mergeback PR from private to public.
 2020-12-10 15:14:37 +05:00
Ali Akbar
e209d892c1 Merge pull request #210 from edx/IM/security-fixes-2 
Incident Management security fixes 2
 2020-12-10 14:26:25 +05:00