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

56714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
adeelehsan
f6d743ad6b applied rebranding to saml page 2020-12-11 01:41:21 +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
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
Alexander Sheehan
2220a1bcb2 Adding feature flag for subsection grade update signal 2020-12-09 14:01:39 -08:00
Feanil Patel
cdbbe077c2 Enable keeping some request history. 
This makes it easire to debug things like POST requests that would
otherwise not be easily debugged during development.
 2020-12-09 16:47:23 -05:00
edX Transifex Bot
f2785ac685 geoip2: update maxmind geolite country database 2020-12-09 15:58:58 -05:00
Awais Jibran
cd29bb1424 move font-size to body 2020-12-10 01:44:48 +05:00
Talia Rhodes
ab23c1c943 update edx-enterprise to include integrated channel api 2020-12-09 15:26:31 -05:00
Awais Jibran
f2305ad8c3 Update base fontsize on progress page 2020-12-10 01:11:52 +05:00
Feanil Patel
1984751472 Merge pull request #25822 from edx/feanil/celery_worker_fix 
Only instantiate one celery app per process.
 2020-12-09 14:45:55 -05:00
Carla Duarte
774210cf33 Merge pull request #25805 from edx/ddumesnil/aa-503 
AA-503: Add id verification status into API
 2020-12-09 14:37:04 -05:00
Adam Stankiewicz
4595f44e09 bump edx-enterprise to 3.13.10 (#25821) 2020-12-09 14:26:32 -05:00
Feanil Patel
ab6bf348d4 Only instantiate one celery app per process. 
Ticket: BOM-2086

Currently there are parts of the LMS that import content from the CMS
APP and vice-versa.  When this happens, we end up with 2 instances of
the celery app and some tasks get registered to the wrong one. The
tasks that were getting registered to the wrong one are never able to
run and result in lots of production errors on celery workers.

The timing of the CMS celery app instantiation is non deterministic
so different tasks get lost depending on when it's imported by some
code in the LMS.

As long as SERVICE_VARIANT is set, this code should prevent the
instantiation of both celery apps.
 2020-12-09 14:13:40 -05:00
Kyle McCormick
643fbe82a0 Downgrade REDIRECT_TO_COURSEWARE_MICROFRONTEND to CourseWaffleFlag (#25815) 
The toggle was previously an ExperimentWaffleFlag,
which allows stable A/B testing but increases the toggle's
complexity. Since we do not plan an doing any more A/B
tests as part of the MFE rollout, we can 'downgrade' this
toggle to a CourseWaffleFlag, which still allows us to do
phased rollout and course-run-specific overrides.
 2020-12-09 13:48:47 -05:00
adeel khan
e518e62e20 Merge pull request #25794 from edx/adeel/fix_checkbox_text 
Make optional checkbox text small.
 2020-12-09 23:24:00 +05:00
Alexander Sheehan
6ef93078f9 adding unit tests for assessment level reporting and hashing cache key. 2020-12-09 10:07:46 -08:00
Zachary Hancock
283fafe53b update edx-proctoring (#25817) 2020-12-09 12:55:57 -05:00
edX cache uploader bot
89d182be62 Updating Bokchoy testing database cache (#25814) 2020-12-09 19:00:41 +05:00
Zainab Amir
5c8608247f update title on register page to h1 (#25813) 2020-12-09 18:01:53 +05:00
Justin Lapierre
dfe15503ce Merge pull request #25012 from open-craft/farhaan/bb-2961-ora-button-support 
[BB-2961] [BD-05] [TNL-7577] Added open response button to the component tray
 2020-12-09 07:55:52 -05:00
Zainab Amir
274f8b0590 Add class to section title on Password Assistance page (#25812) 2020-12-09 17:03:25 +05:00
Ned Batchelder
eb82e64b51 Merge pull request #25809 from raccoongang/rg/fix/bookmarks_deletion 
In the LMS, bookmarks associated to deleted units are not deleted
 2020-12-09 06:19:27 -05:00
Awais Jibran
09bd76b47a Merge pull request #25810 from edx/aj/branding/update-edx-ace-email-logo-height 
Adjust height/width as per new logo.
 2020-12-09 16:03:13 +05:00
Ali Akbar
eafd163980 Merge pull request #25807 from edx/aakbar/PROD-2206 
disable xsslint
 2020-12-09 15:08:48 +05:00
Awais Jibran
d44a31247a Adjust height/width as per new logo. 2020-12-09 14:42:04 +05:00
Ali-D-Akbar
3aa0f7e2e8 disable xsslint 2020-12-09 12:41:47 +05:00
Max Sokolski
22a88de1ea In the LMS, bookmarks associated to deleted units are not deleted 2020-12-09 04:51:09 +02:00
Alexander Sheehan
66e0f6bf5d caching enterprise learner lookup 2020-12-08 14:51:40 -08:00
Alexander Sheehan
440773a72d Adding signals and receivers for assessment level reporting to integrated channels 2020-12-08 14:51:40 -08:00
Dillon Dumesnil
354c9ada5f Merge pull request #25804 from edx/ddumesnil/aa-471 
AA-471: Removing the export_staff_users command
 2020-12-08 12:40:36 -08:00
Dillon Dumesnil
a7e712ad4e AA-503: Add id verification status into API 
This will be used for the Course Exit experience to improve our
messaging for learners in the 'pending' state
 2020-12-08 20:08:52 +00:00
Ned Batchelder
2dd618e3a2 Merge pull request #25756 from edx/nedbat/settable-support-link 
New LOGIN_ISSUE_SUPPORT_LINK setting
 2020-12-08 15:07:13 -05:00
Dillon Dumesnil
38a7e0b5a8 AA-471: Removing the export_staff_users command 2020-12-08 19:37:26 +00:00
Ned Batchelder
0578174378 Merge pull request #25760 from open-craft/mtyaka/squash-warning 
Register pytest mongo marker to avoid warning.
 2020-12-08 13:20:27 -05:00
alangsto
1def252129 adding course waffle for proctoring info panel (#25803) 
updated for feedback
 2020-12-08 13:05:57 -05:00
Ned Batchelder
702975613e Merge pull request #25751 from open-craft/farhaan/bb-3269-file-upload-to-work-correctly 
[BTR-38] [BB-3269] Add openassessment url to CMS
 2020-12-08 12:11:11 -05:00
Bianca Severino
9172935ca5 Merge pull request #25792 from edx/bseverino/idv-course-key 
Fix query string being passed into IDV flow
 2020-12-08 09:39:53 -05:00