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

56693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
edX Transifex Bot
f2785ac685 geoip2: update maxmind geolite country database 2020-12-09 15:58:58 -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
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
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
Kyle McCormick
739e8a1e71 Stringify keys in backfill_orgs_and_org_courses (#25802) 
The command was failing when it encountered both Old Mongo
and Split Mongo course keys, as it tried to `sort` the keys,
but Opaque Keys are only comparable if they are of the same
type. The solution is to convert them to strings before sorting.
The edx-organizations code that instruments the backfill knows
to parse them back into CourseKeys.
 2020-12-08 09:36:46 -05:00
Adam Stankiewicz
f64c3cf947 bump edx-enterprise to 3.13.7 (#25801) 2020-12-08 09:07:28 -05:00
Michael Terry
639d043675 Merge pull request #25765 from edx/mikix/upgrade-sidebar 
AA-383: add verified mode info to course_home outline API
 2020-12-08 08:43:38 -05:00
Awais Jibran
0cbfbd5272 Merge pull request #25798 from edx/aj/update-edge-logo-height 
Update Edge footer logo height
 2020-12-08 14:35:59 +05:00
Awais Jibran
f146ca0600 Edge logo height 2020-12-08 13:44:36 +05:00
Muhammad Ammar
eee2cab9a8 Merge pull request #25793 from edx/ammar/update-edx-enterprise-to-3.13.6 
update edx-enterprise to 3.13.6
 2020-12-08 12:23:05 +05:00
Adeel Khan
099e9eeb95 Make optional checkbox text small. 2020-12-08 03:14:31 +05:00
muhammad-ammar
2aebb31c7f update edx-enterprise to 3.13.6 2020-12-08 02:46:59 +05:00
Zachary Hancock
e2d9c34d5c Expose proctoring waffle to edx-proctoring templates (#25704) 
* pass proctoring waffle flag on render
 2020-12-07 16:30:26 -05:00
Ned Batchelder
db9bd85308 Merge pull request #25788 from edx/nedbat/pin-random2 
Pin the third-party random2 library
 2020-12-07 16:21:59 -05:00
Bianca Severino
8805914b52 Fix query string being passed into IDV flow 2020-12-07 16:21:44 -05:00
SaadYousaf
78e901121b add new header avatar asset. 2020-12-08 01:01:07 +05:00
Farhaan Bukhsh
aa18d88fa9 Fix test with updated ORA template 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-08 00:58:23 +05:30
Awais Jibran
685e061d6c Merge pull request #25768 from edx/aj/branding/progress-page 
Update progress page headings
 2020-12-08 00:00:26 +05:00
Giovanni Cimolin da Silva
1d979dad8b Merge branch 'master' into farhaan/bb-2961-ora-button-support 2020-12-07 15:01:55 -03:00
Ned Batchelder
a52baf605c Pin the third-party random2 library 2020-12-07 12:57:05 -05:00
David Joy
a9f1a03787 Pin requirements to temporarily fix instructor task registration (#25787) 
* Pin requirements to temporarily fix instructor task registration

We ran into an issue where instructor tasks were not being registered with celery correctly, resulting in: https://openedx.atlassian.net/browse/CR-2982

The cause wasn’t clear, so we started reverting some recent, suspect PRs.  When we reverted #25746, the issue went away.

The revert PR was this one: https://github.com/edx/edx-platform/pull/25766

So that we can unpause our deployment pipelines, we’re temporarily pinning the versions of the four packages upgraded in #25746 so we can continue to investigate.

* Result of make upgrade, propagating constraints out to other requirements files
 2020-12-07 12:48:23 -05:00
Giovanni Cimolin da Silva
ca73d117ff Fix version bump 2020-12-07 14:44:05 -03:00
Giovanni Cimolin da Silva
b6ae24ffcc Version bump 2020-12-07 14:37:23 -03:00
Farhaan Bukhsh
8a7eef2c01 Update dependency for ORA2 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:03 -03:00
Farhaan Bukhsh
4c61ba28bc Added the condition for the first template to be blank assessment. 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:03 -03:00