Commit Graph

23251 Commits

Author SHA1 Message Date
ha-D
d3bc4601ae feat: Add course-wide custom scripts
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 b6cb629849..0578e1c4c6 onto b6cb629849:
- Add course-wide resources to API for MFE use
- Revert "Add course-wide resources to API for MFE use" reverts commit 53648dcf0afe3cd171c9dc2eb5e56b871b2bcfb2

Signed-off-by: Gabor Boros <gabor.brs@gmail.com>
2021-10-04 11:24:45 -07:00
Soban Javed
71debe7f7b fix: remove fake2 language from django settings
This was causing issue with Django 3.2, as Django has restricted to only use language from the pre-defined set of languages provided by Django.

BOM-2870
2021-10-04 20:44:18 +05:00
Awais Qureshi
fa959f1ed9 Merge pull request #28810 from edx/removing-cors-headers-checks
chore: `django-cor-headers` post deployment cleanup.
2021-10-04 17:12:47 +05:00
Awais Qureshi
9010e99a80 Merge pull request #28904 from edx/fixing-dj32-setuptestdata-tests
Fixing dj32 setuptestdata tests
2021-10-04 16:03:11 +05:00
Awais Jibran
06b912e5db refactor: optimise imports (#28897) 2021-10-04 11:15:32 +05:00
Awais Qureshi
34a1cff178 fix: django32 2021-10-03 01:37:49 +05:00
Awais Qureshi
b3459b3589 fix: Fixing test due to the change in django32.
Objects assigned to class attributes in TestCase.setUpTestData() are now isolated for each test method.

https://docs.djangoproject.com/en/3.2/releases/3.2/#tests

BOM-2866
2021-10-02 17:04:03 +05:00
Awais Qureshi
c5f3d75c2b fix: Fixing test due to the change in django32.
Objects assigned to class attributes in TestCase.setUpTestData() are now isolated for each test method.

https://docs.djangoproject.com/en/3.2/releases/3.2/#tests

BOM-2866
2021-10-02 16:15:32 +05:00
Awais Qureshi
7eb00d63c5 fix: Fixing test due to the change in django32.
Objects assigned to class attributes in TestCase.setUpTestData() are now isolated for each test method.

https://docs.djangoproject.com/en/3.2/releases/3.2/#tests

BOM-2866
2021-10-02 00:45:38 +05:00
Awais Qureshi
aa16142659 fix: Fixing test due to the change in django32.
Objects assigned to class attributes in TestCase.setUpTestData() are now isolated for each test method.

https://docs.djangoproject.com/en/3.2/releases/3.2/#tests

BOM-2866
2021-10-02 00:45:18 +05:00
Kshitij Sobti
dd6e908635 feat: Add support for pinning and closing threads, adds a preview and a delete check field (#28809)
Adds support for pinning and closing threads to the current REST APIs for discusions.
Adds a preview_body field to the thread response that contains a truncated version of the raw body with tags removed so it can be shown in previews.
Adds a field called "can_delete" to threads and comments that signals if the current user is able to delete that resource.
2021-10-01 19:57:12 +05:00
Tinuade Adeleke
ae4c0e6c13 feat:mark wiki as configurable in plugin (#28845) 2021-10-01 16:55:50 +05:00
Awais Jibran
872de99acc fix: textbooks should be enabled if course has any textbooks enabled. (#28887)
fix: proctoring settings to show pop up modal
fix: custom pages to be "disabled" by defualt
fix: only build lagacy link when app sends any link
2021-10-01 16:26:14 +05:00
Gábor Boros
0935b5c51f feat: adds CELERY_BROKER_TRANSPORT_OPTIONS (#28849)
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>
2021-09-30 14:30:28 -04:00
Matthew Piatetsky
8be9fb6b51 feat: Allow updating goals reminder field without providing the days_per_week field (#28881) 2021-09-30 12:01:02 -04:00
Matthew Piatetsky
caec8f6f29 [AA-909] Create goal reminder email (#28822)
* feat: Create goal reminder email in ace

* creating email
2021-09-30 11:53:14 -04:00
Usama Sadiq
d5e2ac9b0e fix: update static file path in tests (#28872)
fix similar test in openedx
2021-09-30 19:16:23 +05:00
Zia Fazal
c15c5380a3 Merge pull request #28790 from edly-io/ERTE-88
Remove event routing backends from edx-platform
2021-09-30 18:44:14 +05:00
M. Zulqarnain
5018256524 fix: test failing on Django 3.2 (#28876) 2021-09-30 17:55:33 +05:00
Matthew Piatetsky
be5241a96d Merge pull request #28865 from edx/AA-905b
[AA-905] Refactor flag for recording user activity
2021-09-30 08:51:30 -04:00
Matthew Piatetsky
ae618151a9 fix: Remove debugging flag that is no longer necessary and refactor 2021-09-29 15:05:14 -04:00
Mike OConnell
3d07e72240 Merge pull request #28859 from edly-io/ERTE-55-1
feat: Added support for enterprise id in course_grade_passed_first_time event
2021-09-29 10:31:00 -04:00
David Ormsbee
82441d6f87 Merge pull request #28837 from edx/ormsbee/edx_when_outline_optimization
Re-enable edx-when outline optimization
2021-09-29 09:17:39 -04:00
RehanAziz
3633cdbc01 feat: Added support for enterprise id in course_grade_passed_first_time event 2021-09-28 18:52:15 +05:00
RehanAziz
f6f45eab50 ERTE-88 Remove event routing backends from edx-platform 2021-09-28 17:24:52 +05:00
Usama Sadiq
eaf2e68d2a build: Use DeploymentMonitoringMiddleware in settings (#28850) 2021-09-28 15:31:26 +05:00
David Ormsbee
deaf80f346 revert: "[BD-13] Let ModuleSystem use UserService" (#28857)
This caused a regression where anonymous_id values were not as expected.
Reverting for now, with investigation to follow.
2021-09-27 15:42:35 -04:00
Julia Eskew
cc3747add6 feat: Optimize the querying of course block dates when querying dates for use in a
course outline, which don't need block dates below the subsection level of a course.
Pass the course's published version to all the appropriate places where edx-when's API
is called - to allow edx-when to more efficiently cache queried/processed results.

TNL-8061
2021-09-27 12:02:59 -04:00
David Ormsbee
3827f4c90d Merge pull request #28440 from open-craft/jill/BD-13-user-service
[BD-13] Let ModuleSystem use UserService
2021-09-24 09:26:43 -04:00
David Ormsbee
03382ae400 revert: feat: Added support for enterprise id in course_grade_passed_first_time event" (#28831) 2021-09-23 17:56:07 -04:00
Usama Sadiq
023f4144ab fix: fix new pylint warnings (#28725) 2021-09-23 17:54:15 +05:00
Kshitij Sobti
32748788bf fix!: use bleach instead of custom code to sanitise forum posts (#28641)
The rest API for discussions was using custom HTML sanitisation code that
matched the behaviour of the client-side library. This replaces the custom
code with bleach for better security.
2021-09-23 11:37:05 +05:00
Jillian Vogel
927016a8df refactor: fixes tests
* UserStubService now takes user, user_is_staff, and anonymous_user_id
* get_test_system() creates a UserStubService with an anonymous_user_id of 'student'
* Removes references to deprecated ModuleSystem attributes from test code
* Fixes and simplifies the ConditionalBlock tests, using get_module provided by TestModuleSystem instead of trying to mock out all the pieces.
2021-09-23 12:04:03 +09:30
Jillian Vogel
753839276f refactor: removes calls to deprecated ModuleSystem attributes
Removes references to these deprecated attributes from the platform code:
* runtime.anonymous_student_id
* runtime.seed
* runtime.user_id
* runtime.user_is_staff

Related changes:

* Ensure that all platform XBlocks which use these attributes "need" the user service.
* ProblemBlock: Removes check for existence of runtime.seed attribute in preparation for removal of this attribute from ModuleSystem.
* edxnotes: Catches NoSuchServiceError just in case some XBlocks using notes don't have the user service.
* UserTagsService refactor: pass user and course_id on creation
2021-09-23 11:46:43 +09:30
Jillian Vogel
c41e7fb93a refactor: deprecate ModuleSystem user attributes in favor of user service
The following ModuleSystem attributes are deprecated by this change, and should be pulled directly from the user service instead:

* anonymous_student_id
* seed
* user_id
* user_is_staff

Related changes:

* Removes the `user` and `anonymous_student_id` parameters from the ModuleService constructor.
* Stores anonymous_user_id in XBlockDjangoUserService's opt_attr
* Pulls out constants used by DjangoXBlockUserService opt_attr so they can be used in the platform code.
* LmsModuleSystem uses the user service created in wrapper function for runtime.publish to avoid requiring the user
  service to be "needed" by all XBlocks.
* LmsModuleSystem no longer checks for instances of XModuleDescriptor when deciding what kind of anonymous_user_id to
  provide:  all XModules are XBlocks, so this check is unnecessary.
* XBlockRuntime returns a user service when requested
* Adds tests for deprecated ModuleSystem attributes and changes to XBlockDjangoUserService.
2021-09-23 11:41:43 +09:30
Felipe Montoya
dbb4658819 Merge pull request #28640 from eduNEXT/MJG/2nd_batch_openedx_events
[BD-32] feat: add 2nd batch of Open edX Events
2021-09-22 14:12:06 -05:00
Bianca Severino
24e7819a2c Merge pull request #28815 from edx/bseverino/remove-proctoring-mfe-flags
[MST-938] Remove special exam MFE flags
2021-09-22 09:59:58 -04:00
Bianca Severino
0484799f84 fix: remove special exam mfe flags 2021-09-22 09:07:33 -04:00
Awais Qureshi
38e16d56b6 Merge pull request #28750 from edx/dj-cookie-samesite
fix: Don't use django-cookies-samesite on Django >= 3.1
2021-09-22 16:41:16 +05:00
Awais Qureshi
83d6e76d67 django30, 31 testing. 2021-09-22 09:42:47 +05:00
julianajlk
a7759582df fix: privacy banner close button issue in Track Selection (#28814) 2021-09-21 16:58:26 -04:00
julianajlk
94378cb06c feat: add JS for upgrade button redirect in Track Selection (#28805)
REV-2387
2021-09-21 13:34:10 -04:00
Awais Qureshi
780ff09ce3 chore: django-cor-headers post deployment cleanup.
CORS_ORIGIN_WHITELIST configs already updated with schemes so no need for other list.
2021-09-21 20:01:32 +05:00
Matjaz Gregoric
5487ff5906 Fix RTL issue with capa problems (#28562)
* fix: resolve styling cap RTL styling issue

Margins were incorrect in the RTL version of the stylesheet.

* fix: move style overrides from lms-course to capa

These styles were only applied to the LTR version of the stylesheet, but
we want them in the RTL version as well.
2021-09-21 10:44:35 -04:00
Phillip Shiu
6d7dcef8d6 fix: correct typo, content is locked, not lost (#28802) 2021-09-21 09:49:55 -04:00
Sarina Canelake
c699923d03 Merge pull request #28628 from edx/sarina/i18n-tuneup
fix: abstract edX-specific strings
2021-09-21 08:57:58 -04:00
AsadAzam
208e1b177c feat: Implement program discussions iframe (#28770)
* feat: Implement program discussions iframe

* Fixed conflicts

* Fixed conflicts

* Fixed conflicts

* Refactored code
2021-09-21 16:24:52 +05:00
edX requirements bot
0f528f9125 Python Requirements Update (#28806)
* chore: Updating Python Requirements

* fix: disabled unused import warnings

Co-authored-by: Usama Sadiq <usama.sadiq@arbisoft.com>
2021-09-21 14:21:00 +05:00
Michael Terry
1133854a59 Merge pull request #28783 from edx/mikix/goal-reminder-email-aa-908
Add goal reminder email management command
2021-09-20 15:18:18 -04:00
Michael Terry
ce39f52680 chore: add tests for new goal reminder email management command 2021-09-20 14:32:06 -04:00