242 Commits

Author SHA1 Message Date
Feanil Patel
a0ab48921f fix: Handle a case that could cause infinite redirects.
If ENABLE_MKTG_SITE is True, MKTG_URLS['ROOT'] must be set.  However if
it is set to the same value as the LMS_ROOT_URL (which points to this
view), you can end up in an infinite redirect loop.  If the two URLs do
match, don't redirect, just fall through to the content that this page
would have responded with instead.
2025-10-21 12:11:57 -04:00
Feanil Patel
82073d395c fix: Drop references to the FEATURES dict.
These are out of date and while they still work with the proxy object we
don't need them anymore.  Just look up the setting directly.
2025-10-20 15:28:54 -04:00
Serhii Nanai
6c31268a9d test: use ENABLE_CATALOG_MICROFRONTEND from settings 2025-09-30 11:00:43 +03:00
Serhii Nanai
d6a2942ad0 refactor: switch to global mfe state check 2025-09-30 10:22:12 +03:00
Serhii Nanai
75b7a83dc6 feat: add redirects to mfe for catalog-related legacy pages 2025-09-30 10:22:12 +03:00
Serhii Nanai
13f450ff29 fix: use getattr in use_catalog_mfe 2025-09-29 15:03:41 +03:00
Serhii Nanai
e2d50f5b4d test: fix ENABLE_CATALOG_MICROFRONTEND look up in tests 2025-09-29 14:47:22 +03:00
Serhii Nanai
b448b0fe69 fix: look up ENABLE_CATALOG_MICROFRONTEND in settings directly, adjust tests 2025-09-29 14:16:46 +03:00
Serhii Nanai
18ec2a1517 fix: fix gettings ENABLE_CATALOG_MICROFRONTEND FEATURE 2025-09-23 20:45:07 +03:00
Andrii
8ca0e17d62 refactor: get rid of env variable for ENABLE_CATALOG_MICROFRONTEND & simplify use_catalog_mfe() 2025-06-25 09:16:06 -04:00
Andrii
94ce8fa147 refactor: remove per-page waffle flag in favour of global one 2025-06-25 09:16:06 -04:00
Andrii
256511e196 refactor: set toggle_target_removal_date 2025-06-25 09:16:06 -04:00
andrii-hantkovskyi
19014463b1 feat: [AXM-2056] add catalog MFE enabled waffle flag (#2639)
* feat: [AXM-2056] add catalog MFE enabled waffle flag

* test: cover waffle with test

* refactor: fix pylint error

* refactor: redesign waffleflag & add new MFE toggle to FEATURES

* test: update tests to new functionality

* refactor: add toggle_use_cases to annotation

* refactor: redesign again to use new approach

* refactor: rename waffle flag variable & update description

---------

Co-authored-by: Andrii <andrii.hantkovskyi@raccoongang.com>
2025-06-25 09:16:06 -04:00
Régis Behmo
bf862d89e7 feat!: hide courses in /courses based on catalog visibility
Previously, courses were always displayed on the LMS /courses page,
independently of their catalog visibility attribute. This meant that
even with visibility="none" courses were being displayed. This was very
counter-intuitive.

With this change, courses are displayed only when their visibility is
set to "both".

This change is flagged as breaking because it has the potential to
affect course catalogs in existing platforms.

To test this change, go to http(s)://LMS/courses as an anonymous user.
Pick a visible course and go to its "advanced settings" in the studio.
Set "Course visibility in catalog" to "about" or "none". Then, clear the
cache with the following command:

    ./manage.py lms shell -c "from django.core.cache import cache; cache.clear()"

Open the /courses page again: the course should no longer be visible.

Close https://github.com/openedx/wg-build-test-release/issues/330
2024-10-16 10:03:46 -04:00
Yagnesh1998
03b189fc7c feat: Remove FOOTER_ORGANIZATION_IMAGE django settings depr52 (#32757)
* feat: Remove FOOTER_ORGANIZATION_IMAGE django settings depr52

* feat: Update api.py

* feat: Update api.py

* feat: Update footer.html

* feat: change in logo images path

* feat: Update footer.html

as per Diana's suggestion white space is removed.
2023-07-19 10:54:29 -04:00
Yusuf Musleh
4ad8ba1b41 feat: list courses details by keys
This adds the ability to get a list of detailed courses based on their
keys provided in the newly added `keys` query param in the `GET /courses/v1/courses/`
endpoint.
2023-07-12 17:22:38 +03:00
Alejandro Matta
fd08f26e5d feat: change wording ccpa footer link (#32303)
Co-authored-by: Alejandro Matta <amatta2u@gmail.com>
2023-06-21 16:12:42 -04:00
Jesse Day
5a0b655860 Merge branch 'master' into jesseday/update-do-not-sell-link-text 2023-01-09 10:59:13 -05:00
Syed Muhammad Dawoud Sheraz Ali
d2fd26ee91 feat: the ability to filter active courses in course listing api (#31502)
* feat: the ability to filter active courses in course listing api
2023-01-09 20:37:30 +05:00
Jesse Day
e68ca593cb fix: update the do not sell link text for legal. 2023-01-06 15:55:12 -05:00
0x29a
dd9f6936bc refactor: xmodule/video_module -> xmodule/video_block 2022-12-19 17:48:49 +01:00
Bianca Severino
c9b776fa7a fix: add cookie and ccpa links to footer 2022-12-16 14:34:36 -05:00
Bernard Szabo
2d544f94be feat: TNL-10136 tease course enrollment from student model
Reapply changes developed in bszabo/TNL-10136-student-course-enrollment branch to current master
2022-12-13 17:19:34 -05:00
Tim McCormack
89412cdfb2 feat: Add optional security policy link in the site footer (#31413)
For edx.org, this will be set to <https://www.edx.org/policy/security>.
The only theme that I'm aware of as supporting this is `edx.org-next` but
other deployments might use this `get_footer` call as well.
2022-12-08 18:43:43 +00:00
Peter Kabiri
41ee16a6b7 fix: Removed hardcoded social media and mobile store images. (#30630) 2022-08-17 17:51:06 +05:00
Diana Huang
521151e712 refactor: Remove edx.org theme. (#30333)
This theme is no longer in use. The theme in use
has been moved to its own private repo.
2022-05-02 09:42:46 -04:00
Feanil Patel
1219837540 chore: Update logo url.
Switch from files.edx.org to the logos.openedx.org url for the "Powered
by Open edX" logos.  We should still keep the old url working as many
old versions of Open edX still referer to it.

We're making this change so that for future versions of the edx-platform
the DNS for these logos lives alongside the rest of the Open edX
infrastructure managed by tCRIL.
2022-01-26 10:14:55 -05:00
Jawayria
2145358836 chore: Applied lint-amnesty on lms/djangoapps/{badges, branding} 2021-12-17 16:20:30 +05:00
Matthew Piatetsky
59dd149137 fix: use the same logo in ace emails as we use in our braze emails (#29494) 2021-12-03 10:51:18 -05:00
M. Zulqarnain
1003f262ad feat: Django codemods on LMS (1) (#28851) 2021-11-02 17:00:46 +05:00
M. Zulqarnain
5018256524 fix: test failing on Django 3.2 (#28876) 2021-09-30 17:55:33 +05:00
sarina
0c74d347f7 fix: abstract edX-specific strings 2021-09-19 14:01:20 -04:00
sarina
a6616fd292 fix: Remove or contextualize refs to edX.org in strings 2021-09-15 12:21:10 -04:00
Dillon Dumesnil
09bc2d11e6 fix: Updating the branding/api.py to use unicode copyright
This is really just the change to use the unicode copyright symbol
and then rerunning the pull translations logic (minus the transifex step)
to update the eo files. The other changes were just picked up as part of
running those scripts
2021-08-16 09:43:26 -04:00
Usama Sadiq
a1f80a00c7 refactor: pyupgrade second iteration (#27443) 2021-05-03 17:14:25 +05:00
Kyle McCormick
9aefd6f986 style: django-not-configured is not a sensible lint-amnesty value (#26862)
django-not-configured is an error raised by pylint (with
the pylint-django plugin) when it's not correctly configured.

We should not be applying lint amnesty for such a violation.
2021-03-05 08:11:58 -05:00
Jawayria
bf9e498be7 Merge pull request #26536 from edx/jawayria/bom-2352-1
BOM-2352: Removed unused imports from lms/djangoapps/{badges, brandin…
2021-03-04 20:39:23 +05:00
Usama Sadiq
a8449334af refac: ran pyupgrade on lms/djangoapps/branding (#26730) 2021-03-04 14:42:42 +05:00
Jawayria
0491f72c1d BOM-2352: Removed unused imports from lms/djangoapps/{badges, branding, bulk_email, ccx} 2021-02-23 19:37:18 +05:00
Aarif
f35ff6a1eb replaced unittest assertions pytest assertions (#26540) 2021-02-18 19:13:47 +05:00
Jawayria
bf1726ece9 Applied pylint-amnesty to branding 2021-02-01 13:05:31 +00:00
Awais Jibran
eeed906017 Merge pull request #25994 from edx/aj/bulk-email-provide-logo-from-bkend
Provide logo URL from the backend
2021-01-26 15:02:56 +05:00
SaadYousaf
d0d3dc84be cleanup branding app. 2021-01-07 15:01:44 +05:00
Awais Jibran
5a04fb66ff quality fixes 2021-01-06 22:08:50 +05:00
Awais Jibran
7e20cf2215 Provide logo URL from the backend 2021-01-06 17:30:13 +05:00
Ned Batchelder
3abd0e8e62 Update the Open edX logo urls (#25898)
The old URLs now serve the new logo, but at the old pixel size.  These
URLs serve the new logo at a natural pixel size.
2020-12-16 15:30:55 -05:00
Awais Jibran
64e26407f2 Logo Swap & Config for serving assets from cdn.
1. Header Logo
2. Footer Logo
3. Favicon
2020-12-03 17:30:13 +05:00
Kyle McCormick
151bd13666 Use full names for common.djangoapps imports; warn when using old style (#25477)
* Generate common/djangoapps import shims for LMS
* Generate common/djangoapps import shims for Studio
* Stop appending project root to sys.path
* Stop appending common/djangoapps to sys.path
* Import from common.djangoapps.course_action_state instead of course_action_state
* Import from common.djangoapps.course_modes instead of course_modes
* Import from common.djangoapps.database_fixups instead of database_fixups
* Import from common.djangoapps.edxmako instead of edxmako
* Import from common.djangoapps.entitlements instead of entitlements
* Import from common.djangoapps.pipline_mako instead of pipeline_mako
* Import from common.djangoapps.static_replace instead of static_replace
* Import from common.djangoapps.student instead of student
* Import from common.djangoapps.terrain instead of terrain
* Import from common.djangoapps.third_party_auth instead of third_party_auth
* Import from common.djangoapps.track instead of track
* Import from common.djangoapps.util instead of util
* Import from common.djangoapps.xblock_django instead of xblock_django
* Add empty common/djangoapps/__init__.py to fix pytest collection
* Fix pylint formatting violations
* Exclude import_shims/ directory tree from linting
2020-11-10 07:02:01 -05:00
Kyle McCormick
d1a775d3cd Use full names for lms.djangoapps imports (#25401)
* Use full LMS imports paths in LMS settings and urls modules
* Use full LMS import paths in Studio settings and urls modules
* Import from lms.djangoapps.badges instead of badges
* Import from lms.djangoapps.branding instead of branding
* Import from lms.djangoapps.bulk_email instead of bulk_email
* Import from lms.djangoapps.bulk_enroll instead of bulk_enroll
* Import from lms.djangoapps.ccx instead of ccx
* Import from lms.djangoapps.course_api instead of course_api
* Import from lms.djangoapps.course_blocks instead of course_blocks
* Import from lms.djangoapps.course_wiki instead of course_wiki
* Import from lms.djangoapps.courseware instead of courseware
* Import from lms.djangoapps.dashboard instead of dashboard
* Import from lms.djangoapps.discussion import discussion
* Import from lms.djangoapps.email_marketing instead of email_marketing
* Import from lms.djangoapps.experiments instead of experiments
* Import from lms.djangoapps.gating instead of gating
* Import from lms.djangoapps.grades instead of grades
* Import from lms.djangoapps.instructor_analytics instead of instructor_analytics
* Import form lms.djangoapps.lms_xblock instead of lms_xblock
* Import from lms.djangoapps.lti_provider instead of lti_provider
* Import from lms.djangoapps.mobile_api instead of mobile_api
* Import from lms.djangoapps.rss_proxy instead of rss_proxy
* Import from lms.djangoapps.static_template_view instead of static_template_view
* Import from lms.djangoapps.survey instead of survey
* Import from lms.djangoapps.verify_student instead of verify_student
* Stop suppressing EdxPlatformDeprecatedImportWarnings
2020-11-04 08:48:33 -05:00
Sarina Canelake
18059c20e7 Merge pull request #25505 from edx/sarina/gender-neutral-language
Change gendered language to gender-neutral 'they/them/their'
2020-11-03 16:16:59 -05:00