diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 4eb47f2..90a3866 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -2,7 +2,7 @@ name: Sync with private repo on: push: - branches: [ master, main, nightly ] + branches: [ release, main ] jobs: sync: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f58372e..5c50b59 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,9 @@ name: Run tests on: pull_request: - branches: [master] + branches: [ release, main ] + push: + branches: [ release, main ] jobs: tests: diff --git a/README.rst b/README.rst index 220d9a1..f109051 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Credentials application supports course and program certificates. This plugin of Note that user will have to create the course/program using `Discovery plugin `__. Then Credentials plugin will be used for certificates configurations. -.. image:: https://github.com/overhangio/tutor-credentials/blob/master/doc/django-admin-screen-shot.png +.. image:: https://github.com/overhangio/tutor-credentials/blob/release/doc/django-admin-screen-shot.png :alt: Django Admin Installation @@ -47,7 +47,7 @@ User can also create superuser for credentials using the below command Learner Record UI ----------------- -.. image:: https://github.com/overhangio/tutor-credentials/blob/master/doc/learner-record.png +.. image:: https://github.com/overhangio/tutor-credentials/blob/release/doc/learner-record.png :alt: Learner Record MFE screenshot This plugin installs and enables the `Learner Record MFE `__ by default. It contains views for a learners current status in a program, their current grade, and the ability to share any earned credentials either publically or with institutions. @@ -112,4 +112,4 @@ This Tutor plugin is maintained by Muhammad Faraz Maqsood from `Edly `_. +This software is licensed under the terms of the `GNU Affero General Public License (AGPL) `_. diff --git a/changelog.d/20241119_124240_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_124240_dawoud.sheraz_branch_rename.md new file mode 100644 index 0000000..fb6e264 --- /dev/null +++ b/changelog.d/20241119_124240_dawoud.sheraz_branch_rename.md @@ -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. \ No newline at end of file diff --git a/tutorcredentials/plugin.py b/tutorcredentials/plugin.py index 9a97d07..9396fc7 100644 --- a/tutorcredentials/plugin.py +++ b/tutorcredentials/plugin.py @@ -11,7 +11,7 @@ from .__about__ import __version__ -# Handle version suffix in nightly mode, just like tutor core +# Handle version suffix in main mode, just like tutor core if __version_suffix__: __version__ += "-" + __version_suffix__