Merge branch 'release'

This commit is contained in:
Régis Behmo 2024-11-27 18:35:01 +01:00
commit 9f8ed6aacb
4 changed files with 10 additions and 5 deletions

View File

@ -2,7 +2,7 @@ name: Sync with private repo
on:
push:
branches: [ master, main, nightly ]
branches: [ release, main ]
jobs:
sync:

View File

@ -2,7 +2,9 @@ name: Run tests
on:
pull_request:
branches: [master]
branches: [ release, main ]
push:
branches: [ release, main ]
jobs:
tests:

View File

@ -73,11 +73,11 @@ To add the default dashboards to the new user, add the ``--bootstrap-dashboards`
Some event data might be missing from your dashboards: just start using your LMS and refresh your dashboard. The new events should appear immediately.
.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/master/screenshots/courseoverview-01.png
.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/release/screenshots/courseoverview-01.png
:alt: Course overview dashboard part 1
.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/master/screenshots/courseoverview-02.png
.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/release/screenshots/courseoverview-02.png
:alt: Course overview dashboard part 2
.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/master/screenshots/courseoverview-03.png
.. image:: https://raw.githubusercontent.com/overhangio/tutor-cairn/release/screenshots/courseoverview-03.png
:alt: Course overview dashboard part 3
By default, ``AUTH_ROLES_SYNC_AT_LOGIN`` is ``false`` which means admin can customize the permissions associated to a user. To disable this behaviour, modify the ``CAIRN_AUTH_ROLES_SYNC_AT_LOGIN`` setting::

View File

@ -0,0 +1,3 @@
- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz):
* Rename **master** to **release**, as this branch runs the latest official Open edX release tag.
* Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.