This reverts commit 441bccf4.

Use an X icon instead of text.

Track program purchase attempts from learner programs dashboard

XBlock fields with formatted-in values can now translate properly

PLAT-1612: Upgrade edx-platform to use new django-babel-underscore (0.5.2)

Add activation_key var to user profile in SailThru.

Yro/neem bugbash

Convert /update_lang/ page to use Bootstrap

Upgrading the edx-organizations package to 0.4.6.

LEARNER-1922

This fixes a bug with the organizations API's get_organization function.

Allow i18n strings to be scraped from openedx/features

LEARNER-2304

Adds settings.FEATURES['THIRD_PARTY_AUTH_HINT']

LEARNER-1426 Fix for dialog rendering

As an email marketer, I would like to send an account activation reminder to learners who haven't activated
their accounts to increase their chances of coming back and engaging with our platform. Each user profile in
SailThru will have a var with the correct activation_key originally assigned to the user.

LEARNER-2110

increase staff user rate limit

EDUCATOR-527 | get_certificates() should take CourseOverview.may_certify() into account

Remove flaky test CoursewareSearchTest::test_reindex  LEARNER-2288

Removed flaky test: test_proctored_exam_flow  EDUCATOR-1178

EDUCATOR-1135: Adds in additional logging for verified tracks management command

Cookie consent page loaded from navigation template instead of footer…

Fix cookie consent page loaded from navigation template instead of footer template after rebasing master

Following the commit ae9c6869, we can see the cookie consent template was loaded from footer template.
The login and registration templates do not load footer, so the cookie consent template is not being loader either.
With this fix, the cookie consent template is being loaded from navigation template, so it is shown in login and registration pages as well.

Merge pull request #15602 from edx/adeel/LEARNER_1426_lms_dashboard_on_enrollment_and_refund_orders_on_demand_version

Improve ECOM connection on student dashboard via on demand ajax calls.

Fix course unenroll dialog's incorrect message rendering. LEARNER-2033

When provided, this setting appends tpa_hint=<value> to the `next` URL provided for /login and /register page URLs, which bypasses the Open edX Login/Register page with an an automatic redirection to the TPA login/register URL.

This allows the already implemented tpa_hint feature to be automatically added to login, registration, and enrolment URLs generated throughout the platform.

Avoids auto-appending the tpa_hint parameter when the request is already in the TPA pipeline, to prevent infinite redirect loops, and adds tests to verify this behaviour.

[ENT-494] Move to new consent API