Merge branch 'release'
This commit is contained in:
commit
9f8ed6aacb
2
.github/workflows/sync.yml
vendored
2
.github/workflows/sync.yml
vendored
@ -2,7 +2,7 @@ name: Sync with private repo
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master, main, nightly ]
|
branches: [ release, main ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sync:
|
sync:
|
||||||
|
|||||||
4
.github/workflows/test.yml
vendored
4
.github/workflows/test.yml
vendored
@ -2,7 +2,9 @@ name: Run tests
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [master]
|
branches: [ release, main ]
|
||||||
|
push:
|
||||||
|
branches: [ release, main ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
tests:
|
tests:
|
||||||
|
|||||||
@ -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.
|
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
|
: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
|
: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
|
: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::
|
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::
|
||||||
|
|||||||
@ -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.
|
||||||
Loading…
x
Reference in New Issue
Block a user