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-20250512-1747008413 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-20250512-1747008413 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.

@Cup0fCoffee Cup0fCoffee force-pushed the sync-open-release/quince.master-20250512-1747008413 branch from f70063d to 90d9b94 Compare July 6, 2025 14:58
Anas12091101 and others added 2 commits July 6, 2025 17:01
…edx#35138) (openedx#35378)

* chore: provide logo url from backend for batch enrollment email
@Cup0fCoffee Cup0fCoffee force-pushed the sync-open-release/quince.master-20250512-1747008413 branch from 90d9b94 to 63f462a Compare July 6, 2025 15:01
* 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>
@Cup0fCoffee Cup0fCoffee force-pushed the sync-open-release/quince.master-20250512-1747008413 branch from 63f462a to d735059 Compare July 6, 2025 15:05
@Cup0fCoffee Cup0fCoffee merged commit 9147c9e into opencraft-release/quince.1 Jul 6, 2025
10 of 42 checks passed
@Cup0fCoffee Cup0fCoffee deleted the sync-open-release/quince.master-20250512-1747008413 branch July 6, 2025 15:06
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