Commit Graph

63233 Commits

Author SHA1 Message Date
Ahtisham Shahid
bf4b3c628b refactor: updated api reference from unseen to seen (#32501) 2023-06-21 13:02:28 +05:00
Feanil Patel
c2c0e67a5d Merge pull request #32341 from open-craft/kshitij/remove-edx-sphinx-theme
chore: replace edx-shinx-theme with sphinx-book-theme in dev dependencies
2023-06-20 15:14:44 -04:00
Zachary Hancock
41c27e8cbd Add exams dashboard MFE to instructor dash (#32493)
* feat: use new exams mfe for lti enabled courses
2023-06-20 10:21:43 -04:00
Kyle McCormick
5671dab975 build: common/static/css/xmodule -> xmodule/static/css (#32291)
Now that all XModule SCSS is located in xmodule/static/sass,
it would make sense to co-locate the CSS there as well.

We also add a README to explain the purpose of this new folder.

In the future, we will move xmodule/js and xmodule/assets
into xmodule/static as well.

Part of: https://github.com/openedx/edx-platform/issues/32292
2023-06-20 08:05:05 -04:00
Raza Dar
aaac11cfae Merge pull request #32521 from openedx/mrazadar/PON-88/orders-and-subscriptions
Revert: History changed to Orders & Subscriptions behind a flag
2023-06-20 16:53:49 +05:00
Raza Dar
a18e418a07 feat: update: Reverted - History changed to Orders & Subscriptions 2023-06-20 16:18:54 +05:00
Awais Qureshi
2a1cf5f0d0 chore: upgrading djangorestframework. (#32487)
* chore: upgrading djangorestframework.
2023-06-20 16:03:34 +05:00
Mohammad Ahtasham ul Hassan
4048bf9fb4 feat: fix throttling for subscription service user (#32473)
* feat: add subscriptions_worker to ent access list

* fix: add throttle for entitlement APIS
2023-06-20 14:58:35 +05:00
Awais Qureshi
78e4bd0844 Revert "Revert "feat!: openedx-django-pyfs will now use boto3 to generate-urls. (#32453)" (#32477)" (#32503)
This reverts commit ee0bdecf85.
2023-06-20 14:27:29 +05:00
Muhammad Adeel Tajamul
aab3624960 feat: added parser to update existing notification on get (#32450) 2023-06-20 14:10:21 +05:00
SaadYousaf
4c36156c8c feat: add content field property to Notification model 2023-06-20 13:32:52 +05:00
Raza Dar
6c41246e85 Merge pull request #32490 from openedx/mrazadar/PON-88/orders-and-subscriptions
feat: add B2C subscription flag for header change
2023-06-20 12:47:09 +05:00
Moeez Zahid
9fd913bb03 fix: Add platform name to mobile config cache key (#32504) 2023-06-19 19:46:25 +05:00
Awais Ansari
8990035116 feat: add notifications mark as read API (#32475)
* feat: add notifications mark as read API

* chore: update description for mark as read notification URL

* refactor: resolve pylint issue

* refactor: notifications mark as read API and test cases

* feat: add translated messages in notificationsAPI response
2023-06-19 18:47:56 +05:00
Awais Qureshi
7a217bf912 fix: removed 'providing_arg from code its removed in django40. (#32474) 2023-06-19 16:49:34 +05:00
SaadYousaf
3eab837c0b feat: add management command to generate notification preferences for course 2023-06-19 16:45:28 +05:00
github-actions[bot]
4597cfc070 feat: Upgrade Python dependency learner-pathway-progress (#32505)
chore: Added management command to update LearnerPathwayProgress

Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master`

Co-authored-by: bilaltahir21 <bilaltahir21@users.noreply.github.com>
2023-06-19 15:46:22 +05:00
Usama Sadiq
03489910ba fix: update s3 connection method (#32492)
* fix: update s3 connection method and fixing tests.
2023-06-19 15:15:48 +05:00
Kshitij Sobti
457fd46599 chore: replace edx-shinx-theme with sphinx-book-theme in dev dependencies
As part of the deprecation process for edx-sphinx-theme a previous PR switched
to sphinx-book-theme, however edx-sphinx-theme still remained as a dependency in
one place, which is now removed in this PR.
2023-06-19 15:22:25 +05:30
Moeez Zahid
2d1a6e27fc refactor: Add exception handling to Apple migration commands (#32500)
* refactor: Add exception handling to Apple migration commands

* refactor: Remove extra import
2023-06-19 14:07:24 +05:00
Jenkins
23fa9248de chore(i18n): update translations 2023-06-18 17:04:20 -04:00
Kyle McCormick
0b455e0336 build: commit XModule SCSS entrypoints of generating them (#32290)
`xmodule_assets` generated a series of SCSS "entrypoint"
files, where each entrypoint file imported from the
SCSS "sources" in xmodule/css.

This process was more complicated up until very
recently (see PRs in issue linked below for more
context). Now that the process is simpler, though,
there is no reason to generate the SCSS entrypoints;
we can just commit them to the repository instead!
So, we go from this:

    # GENERATED: SCSS entrypoints files for CMS
    common/static/xmodule/descriptors:
       AboutBlockStudio.scss
       AnnotatableBlockStudio.scss
       ...
    # GENERATED: SCSS entrypoints files for LMS
    common/static/xmodule/modules:
       AboutBlockPreview.scss
       AnnotatableBlockPreview.scss
       ...
    # VERSION CONTROLLED: SCSS source files
    xmodule/css:
      annotatable/...
      capa/...
      ...

to this:

    # VERSION CONTROLLED: All XModule SCSS
    xmodule/static/sass:
      # Source files
      include:
        annotatable/...
        capa/...
        ...
      # CMS entrypoint files
      cms:
        AboutBlockStudio.scss
        AnnotatableBlockStudio.scss
        ...
      # LMS source files
      lms:
        AboutBlockPreview.scss
        AnnotatableBlockPreview.scss
        ...

Also, we are able to remove all SCSS-related logic from the
`xmodule_assets` script and from the `HTMLSnippet` class.
XModule JS assets still need processing, but we will address
those in a separate series of PRs.

Part of: https://github.com/openedx/edx-platform/issues/32292
2023-06-16 08:51:03 -04:00
Usama Sadiq
ee0bdecf85 Revert "feat!: openedx-django-pyfs will now use boto3 to generate-urls. (#32453)" (#32477)
This reverts commit 6bef88c9f6.
2023-06-16 15:38:00 +05:00
Raza Dar
b05fe46267 feat: add B2C subscription flag for header change 2023-06-16 14:39:59 +05:00
Mubbshar Anwar
c55f0961ba fix: update event property (#32479)
Update event property name which was added to measure the conversion rate of registration through on ramp experience.

VAN-1478
2023-06-16 09:06:25 +05:00
Jesper Hodge
a6c57811cd feat add xblock api endpoint (#32282)
* feat: add xblock endpoint for updating an xblock

fix: remove debugger

feat: make function call more generic

refactor: just use request.json for request data as before

refactor: extract method

fix: revert wrong method change

fix: refactor correct method

feat: use handle_xblock method so that we can do more than update xblocks

fix: usage_key_string defaults to None

add all CRUD operations

fix usage key parameter

refactor: create /views folder

refactor: move xblock view functions to xblock_services

fix: tests

fix: tests

refactor: move xblock API endpoint to contentstore

* docs: add explanatory comment to new xblock_service

* feat: add feature flag for enabling content editing api

* feat: raise 404 if studio content api is disabled

* tests: test xblock endpoint

* test: make all post tests work

* test: check that xblock_handler receives correct args

* refactor: create util mixin for course factories with staff

* refactor: extract course staff authorization tests

* refactor: extract tests to api view testcase class

* test: add get tests

* test: fix tests

* test: fix tests

* test: fix tests

* test: add all crud tests

* fix: refactor to fix tests

* fix: merge conflict

* fix: merge conflict

* fix: tests after merge

* fix: json request decorator

* fix: lint

* fix: lint

* fix: lint

* fix: lint

* fix: new test files

* fix: lint

* fix: lint and apply PR suggestions

* fix: lint

* fix: lint

* fix: lint

* fix: lint

* fix: lint

* fix: lint
2023-06-15 14:17:49 -04:00
Robert Raposa
e7e4fa3935 temp: remove flaky test_login_and_registration_form_ratelimited (#32459) 2023-06-15 11:43:17 -04:00
Feanil Patel
82dde016f6 Merge pull request #32239 from openedx/feanil/migration_check
Migrate migration checks to `minimal.yml` config.
2023-06-15 11:06:14 -04:00
Feanil Patel
68aa7556c1 Merge pull request #32446 from openedx/feanil/fix_redudant_urls
fix: Update how we render the error pages.
2023-06-15 10:10:23 -04:00
Piotr Surowiec
e439b3f749 Merge pull request #32356 from open-craft/agrendalath/fc-0026-user-checks
feat: remove block-specific handling from runtime role checks [FC-0026]
2023-06-15 15:32:59 +02:00
Justin Hynes
2f8b7380fb Merge pull request #32463 from openedx/jhynes/APER-2504_changes-part-2
feat: add ability for `notify_credentials` to revoke program certs
2023-06-15 08:25:27 -04:00
Nawfal Ahmed
0aa92af0b2 fix: fix edge-case for completed courses in a subscription program (#32476) 2023-06-15 17:25:02 +05:00
Mubbshar Anwar
a62276b8ce feat: registration event property (#32447)
Registration event property to calculate conversion rate through on ramp experience.

VAN-1478
2023-06-15 17:20:43 +05:00
Zainab Amir
d5be2c8033 feat: Get welcome page context (#32426) 2023-06-15 17:09:47 +05:00
Jenkins
7a047021b1 chore(i18n): update translations 2023-06-15 07:01:31 -04:00
Awais Qureshi
6bef88c9f6 feat!: openedx-django-pyfs will now use boto3 to generate-urls. (#32453)
* feat!: openedx-django-pyfs will now use boto3 to generate-urls.
---------

Co-authored-by: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com>
2023-06-15 15:05:33 +05:00
ayesha waris
d3b1ce176a feat: adds waffle flag for show notifications tray (#32451)
* feat: adds waffle flag for show notifications tray

* refactor: refactored notifications count api code
2023-06-15 14:38:46 +05:00
Agrendalath
bc17163258 chore: update ora2 XBlock 2023-06-15 11:08:41 +02:00
Agrendalath
9fbc263edd feat: remove block-specific handling from runtime role checks 2023-06-15 11:08:03 +02:00
Matjaz Gregoric
bc8576a9bb chore: update PR template for Palm release 2023-06-15 08:31:20 +02:00
Muhammad Faraz Maqsood
65687857d5 enhancement: add support for caching programs for one site (#32380)
* perf!: add support for caching programs on per site bases
2023-06-15 11:29:22 +05:00
Jenkins
7b22a7c322 chore: geoip2: update maxmind geolite country database 2023-06-14 16:58:51 -04:00
Justin Hynes
2beaa1d260 feat: add ability for notify_credentials to revoke program certs
[APER-2504]

This is a companion to PR #32458. This updates the `notify_credentials` management command and adds an additional argument/switch (`--revoke_program_certs`).

If included, this option will be converted to a boolean and passed as a script option. Eventually, the `send_notifications` function (updated in the previously mentioned PR) will determine if we should fire a signal that checks if any program certs need to revoked.
2023-06-14 19:29:55 +00:00
Justin Hynes
e607bb1208 Merge pull request #32458 from openedx/jhynes/APER-2504_update-notify-credentials-to-revoke-prog-certs
feat: add ability for notify_credentials to revoke program certs
2023-06-14 14:38:39 -04:00
Alex Dusenbery
9ce54bc777 feat: edx-enterprise 3.67.0 | compare lowered emails 2023-06-14 12:58:21 -04:00
Justin Hynes
d427d404da feat: add ability for notify_credentials to revoke program certs
[APER-2504]

This PR adds additional functionality to the tasks kicked off when the `notify_credentials` management command is run.

I have added a new keyword arg (revoke_program_certs) that, if True, will check to see if we need to revoke a program certificate. This functionality was introduced to help automate fixing cases where a learner still has access to a Program Certificate even if they have been awarded all of the course certificates in a Program (see APER-2499).

The functionality has to be committed in two separate PRs because of our blue/green deployments. The task changes will come first, then we will update the management command to be able to set/pass the new settings. New settings were added as keyword args (defaulting to False) in order to ensure that we won't trip up our workers.
2023-06-14 16:29:43 +00:00
Kyle McCormick
3fab0aec65 build: import XModule source SCSS directly rather than copying (#32289)
The `xmodule_assets` command copies SCSS source files from
xmodule/css to common/static/xmodule/scss, renaming them
to `{MD5_HASH}.scss` in order to "remove duplicates".
The copied files are then included into the generated
SCSS entrypoint files (eg AnnotatableBlockStudio.scss).

The "de-deplication" is completely unnecessary: there are
only a couple dozen SCSS files, and none of them are duplicates.
This copying process is confusing, it complicates our
build process, and it makes our SCSS harder to understand.

So, in the generated SCSS entrypoint files, we
stop importing the *copied* SCSS sources, and just
import the *original* SCSS sources instead.
For example, common/static/xmodule/descriptors/scss/AboutBlockStudio.scss
is changed from:

    .xmodule_edit.xmodule_AboutBlock {
      @import "9bdcda00f046f78be79aca7791e1d4fb.scss";
      @import "a10fc3e0fd6aca63426a89e75fe69c31.scss";
    }

to:

    .xmodule_edit.xmodule_AboutBlock {
      @import "editor/edit.scss";
      @import "html/edit.scss";
    }

In order to make the `@import` lines work, we add xmodule/css to the list
of lookup dirs for XModule SCSS compilation. We also remove the
copying logic from `xmodule_assets`, as it is no longer needed.

Part of: https://github.com/openedx/edx-platform/issues/32292
2023-06-14 11:30:05 -04:00
Nawfal Ahmed
ee7213427c fix: fix alert icon unexpected behaviour (#32455) 2023-06-14 18:48:20 +05:00
Kaustav Banerjee
489e23983f feat: tpa automatic logout (#32193)
* feat: tpa automatic logout

* chore: modify toggle documentations

* chore: check TPA_AUTOMATIC_LOGOUT_ENABLED in _show_tpa_logout_link

* docs: modify method doc
2023-06-14 17:01:00 +05:00
Nawfal Ahmed
5204ee6981 feat: handle edge cases for purchased courses in a subscription program (#32438) 2023-06-14 16:28:49 +05:00