Skip to content

Conversation

@opencraft-requirements-bot

Syncing opencraft-release/quince.1 with Upstream

Important❗

Please always use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

Note on Conflicts ⚠️

In cases of conflicts you can go ahead and resolve it here on Github if it is simple enough. However if it is a more complicated conflict please follow the steps below:

  1. Check out sync-open-release/quince.master-20251215-1765757782 locally:
  2. Pull latest changes from opencraft-release/quince.1 into that branch, make sure your [REMOTE] is pointing to opencraft-release/quince.1:
git pull [REMOTE] opencraft-release/quince.1
  1. Resolve the conflicts locally, then commit the result. This will create a new merge commit.
  2. Push the new merge commit to sync-open-release/quince.master-20251215-1765757782 to update this PR
  3. Review the PR again and merge when ready!
    Note: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

FatemeKhodayari and others added 5 commits June 28, 2024 16:09
…ge-url

fix: course progress url based on whether the user has learning MFE enabled (for Quince)
…) to quince (openedx#35225)

* fix: disable submit button for archived courses (openedx#34920)
…edx#35138) (openedx#35378)

* chore: provide logo url from backend for batch enrollment email
* feat: course about page markup and styles improvements

* test: update tests according to changes

* fix: relocate course organization and return removed prerequisites info

* fix: display org info above the course title

---------

Co-authored-by: Eugene Dyudyunov <evgen.dyudyunov@raccoongang.com>
Co-authored-by: ihor-romaniuk <ihor.romaniuk@raccoongang.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants