[SE-4631] add CCX ID to generated filename prefixes#434
Closed
gabor-boros wants to merge 6289 commits intomasterfrom
Closed
[SE-4631] add CCX ID to generated filename prefixes#434gabor-boros wants to merge 6289 commits intomasterfrom
gabor-boros wants to merge 6289 commits intomasterfrom
Conversation
…-comparision convert enterprise customer uuid to str before comparison
Use https for open.edx.org links
Tests were referring to internal implementation details of edx-django-utils. This comment removes those references to free the library up to be refactored. ARCHBOM-1584
…itoring-references ARCHBOM-1584: remove internal references to edx_django_utils from tests
The UserIdFilter and RemoteIpFilter logging filter classes were moved from edx-platform to edx-django-utils for more distributed use. This updated removes those classes from edx-platform, and references their counterparts in edx-django-utils. ENT-3494
…irements-dbf6ef2 Python Requirements Update
…_password_url_domain Adds Logistration MFE url for forgot password email.
[BD-21] Fix API docs generation and update swagger.yml
This is part of a removal of the many override methods of toggle flag/namespace classes. This allows us to remove imports of test modules from production code.
This allows us to get rid of waffle_utils' custom WaffleFlag method.
This allows us to get rid of the custom WaffleSwitch and WaffleSwitchNamespace classes from waffle_utils in favour of edx_toggles.toggles classes.
Those classes were ported to edx_toggles. The imports remain in waffle_utils.__init__ for backward compatibility.
These functions should from now on be imported from edx_toggles.toggles.testutils.
This is for backward compatibility.
…override [BD-21] Switch to edx-toggles classes and deprecate waffle override methods
Change gendered language to gender-neutral 'they/them/their'
…enterprise customer admin page.
ENT-3522: Updated edx-enterprise version to 3.10.2 that contains a bug fix for enterprise customer admin page.
…django-mysql FAL-2248: Monkey-patch django db introspection to avoid performance issues
Adds two new fields to the indexed course data: - invitation_only - catalog_visibility Also adds two new settings: `SEARCH_SKIP_INVITATION_ONLY_FILTERING` `SEARCH_SKIP_SHOW_IN_CATALOG_FILTERING` These settings can be used to filter out courses in the search results based on their catalog visibility or based on whether they are invitation-only courses. NOTE: Remove this when the upstream pull request is merged edx:edx-platform#28518 (cherry picked from commit 867d677) (cherry picked from commit a5ba091)
[FAL-2358] Fix RTL issue with capa problems.
…-translation [FAL-2358] Update 'View Course' arabic translation
…tication (#397) * chore: constrain kombu to support redis6 auth Constrains kombu to https://github.com/open-craft/kombu/tree/v4.6.11.1 to allow us to use celery with multi-tenant redis. (cherry picked from commit 3bd3d1e) * feat: adds CELERY_BROKER_TRANSPORT_OPTIONS which can be configured from the lms/studio environment (cherry picked from commit 3c1a43e)
The previous lti-consumer-xblock commit hash was pointing to a code drift branch which was backporting openedx/xblock-lti-consumer#150 to tag `2.4.0` Unfortunately, `config_id` duplicate errors started showing for one of the clients. Accordingly, we had to update the xblock to the latest version which inculded that fix and still supported koa (`2.10.1`). However, openedx/xblock-lti-consumer#150 was not merged until tag `3.0.3`. Thefore, we created a custom tag, `2.10.1-opencraft` which includes the backported change on top of tag `2.10.1`
The customer required replacing the default list, which requires deleting these snippet files.
ADD html snippets from overview unit From here: https://studio.esme-staging.opencraft.hosting/course/course-v1:esme+CT+2021?show=block-v1%3Aesme%2BCT%2B2021%2Btype%40chapter%2Bblock%400d4aefe059784786bd1f8eb850a633b2 The snippets from the overview Unit were added. ADD snippets from all other subsections Added snippets from Typical Section and Quiz CSS lines were removed from all files, as per requested. CORRECT typo which made template invalid
…ml-templates-in-studio Pedrovgp/se4781 add custom html templates in studio
…d-custom-html-templates-in-studio Revert "Pedrovgp/se4781 add custom html templates in studio"
which can be configured from the lms/studio environment refactor: raise ImproperlyConfigured on TypeError Signed-off-by: Gabor Boros <gabor.brs@gmail.com> Co-authored-by: Jillian Vogel <jill@opencraft.com>
…n form (#419) Co-authored-by: Ivo Branco <ivo.branco@fccn.pt>
…6616) feat: grant course/library creation rights by the organization (openedx#26616) This reverts commit 5ca2ce2. Current State (before this commit): Studio, as of today doesn't have a way to restrict a user to create a course in a particular organization. What Studio provides right now is a CourseCreator permission which gives an Admin the power to grant a user the permission to create a course. For example: If the Admin has given a user Spiderman the permission to create courses, Spiderman can now create courses in any organization i.e Marvel as well as DC. There is no way to restrict Spiderman from creating courses under DC. Purpose of this commit: The changes done here gives Admin the ability to restrict a user on an Organization level from creating courses via the Course Creators section of the Studio Django administration panel. For example: Now, the Admin can give the user Spiderman the privilege of creating courses only under Marvel organization. The moment Spiderman tries to create a course under some other organization(i.e DC), Studio will show an error message. This change is available to all Studio instances that enable the FEATURES['ENABLE_CREATOR_GROUP'] flag. Regardless of the flag, it will not affect any instances that choose not to use it. BB-3622 Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
Imlements OEP-15 by adding two fields to the course settings: - Course-wide Custom JS - Course-wide Custom CSS The resources defined in these fields will be rendered in all course pages. Rebase b6cb629..0578e1c4c6 onto b6cb629: - Add course-wide resources to API for MFE use - Revert "Add course-wide resources to API for MFE use" reverts commit 53648dcf0afe3cd171c9dc2eb5e56b871b2bcfb2 cherry picked from commit e482b85 Signed-off-by: Gabor Boros <gabor.brs@gmail.com> Co-authored-by: ha-D <hadi@opencraft.com>
…penedx#26616)" This reverts commit a85f2d0.
…ranslations BB-4977: feat: Compile JS translations for Arabic
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the backport of https://github.com/edx/edx-platform/pull/27028.
This pull requests backport a feature to include CCX course IDs in the generated course filenames used for downloading reports, etc.
The suffix appended to the generated filename prefix is following the
<separator>_ccx_<ccx id>pattern, to ensure unique filename generation per ccx - previously all CCX courses were downloaded with the same name.Dependencies: None
Screenshots:
Sandbox URL: Due to an
DeprecatedEdxPlatformImportErrorexception the sandbox is not provisioned.Merge deadline: None
Testing instructions:
ALLOW_COURSE_STAFF_GRADE_DOWNLOADS,ENABLE_GRADE_DOWNLOADS, andENABLE_COURSE_FILENAME_CCX_SUFFIXfeatures.