christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-04 19:03:39 +00:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/master' into nightly

Browse Source
This commit is contained in:
Overhang.IO 2023-12-05 11:30:38 +00:00
commit 0c4b82f80c
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -7,7 +7,7 @@ assignees: ''
--- ---
<!-- Are you quite sure that you followed the instructions from the Troubleshooting section in the Tutor documentation? https://docs.tutor.overhang.io/troubleshooting.html --> <!-- Are you quite sure that you followed the instructions from the Troubleshooting section in the Tutor documentation? https://docs.tutor.edly.io/troubleshooting.html -->
<!-- If not, please take the time to read them. --> <!-- If not, please take the time to read them. -->
**Bug description** **Bug description**

2
CONTRIBUTING.rst
View File

@ -1,4 +1,4 @@
Contribution Guidelines Contribution Guidelines
======================= =======================
Please check the relevant section of the Tutor docs: `https://docs.tutor.overhang.io/tutor.html#contributing <https://docs.tutor.overhang.io/tutor.html#contributing>`__. Please check the relevant section of the Tutor docs: `https://docs.tutor.edly.io/tutor.html#contributing <https://docs.tutor.edly.io/tutor.html#contributing>`__.

20
README.rst
View File

@ -18,9 +18,9 @@ Tutor: the Docker-based Open edX distribution designed for peace of mind
:alt: Forums :alt: Forums
:target: https://discuss.openedx.org/tag/tutor :target: https://discuss.openedx.org/tag/tutor
.. image:: https://img.shields.io/static/v1?logo=readthedocs&label=Documentation&style=flat-square&color=blue&message=docs.tutor.overhang.io .. image:: https://img.shields.io/static/v1?logo=readthedocs&label=Documentation&style=flat-square&color=blue&message=docs.tutor.edly.io
:alt: Documentation :alt: Documentation
:target: https://docs.tutor.overhang.io :target: https://docs.tutor.edly.io
.. image:: https://img.shields.io/pypi/v/tutor?logo=python&logoColor=white .. image:: https://img.shields.io/pypi/v/tutor?logo=python&logoColor=white
:alt: PyPI releases :alt: PyPI releases
@ -47,11 +47,11 @@ Features
* 100% `open source <https://github.com/overhangio/tutor>`__ * 100% `open source <https://github.com/overhangio/tutor>`__
* Runs entirely on Docker * Runs entirely on Docker
* World-famous 1-click `installation and upgrades <https://docs.tutor.overhang.io/install.html>`__ * World-famous 1-click `installation and upgrades <https://docs.tutor.edly.io/install.html>`__
* Comes with batteries included: `theming <https://github.com/overhangio/indigo>`__, `SCORM <https://github.com/overhangio/openedx-scorm-xblock>`__, `HTTPS <https://docs.tutor.overhang.io/configuration.html#ssl-tls-certificates-for-https-access>`__, `web-based administration interface <https://github.com/overhangio/tutor-webui>`__, `mobile app <https://github.com/overhangio/tutor-android>`__, `custom translations <https://docs.tutor.overhang.io/configuration.html#adding-custom-translations>`__... * Comes with batteries included: `theming <https://github.com/overhangio/indigo>`__, `SCORM <https://github.com/overhangio/openedx-scorm-xblock>`__, `HTTPS <https://docs.tutor.edly.io/configuration.html#ssl-tls-certificates-for-https-access>`__, `web-based administration interface <https://github.com/overhangio/tutor-webui>`__, `mobile app <https://github.com/overhangio/tutor-android>`__, `custom translations <https://docs.tutor.edly.io/configuration.html#adding-custom-translations>`__...
* Extensible architecture with `plugins <https://docs.tutor.overhang.io/plugins/index.html>`__ * Extensible architecture with `plugins <https://docs.tutor.edly.io/plugins/index.html>`__
* Works with `Kubernetes <https://docs.tutor.overhang.io/k8s.html>`__ * Works with `Kubernetes <https://docs.tutor.edly.io/k8s.html>`__
* No technical skill required with the `zero-click Tutor AWS image <https://docs.tutor.overhang.io/install.html#zero-click-aws-installation>`__ * No technical skill required with the `zero-click Tutor AWS image <https://docs.tutor.edly.io/install.html#zero-click-aws-installation>`__
.. _readme_intro_end: .. _readme_intro_end:
@ -69,12 +69,12 @@ Quickstart
Documentation Documentation
------------- -------------
Extensive documentation is available: https://docs.tutor.overhang.io/ Extensive documentation is available: https://docs.tutor.edly.io/
Is there a problem? Is there a problem?
------------------- -------------------
Please follow the instructions from the `troubleshooting section <https://docs.tutor.overhang.io/troubleshooting.html>`__ in the docs. Please follow the instructions from the `troubleshooting section <https://docs.tutor.edly.io/troubleshooting.html>`__ in the docs.
.. _readme_support_start: .. _readme_support_start:
@ -90,7 +90,7 @@ To get community support, go to the official Open edX discussion forum: https://
Contributing Contributing
------------ ------------
We welcome contributions to Tutor! To learn how you can contribute, please check the relevant section of the Tutor docs: `https://docs.tutor.overhang.io/tutor.html#contributing <https://docs.tutor.overhang.io/tutor.html#contributing>`__. We welcome contributions to Tutor! To learn how you can contribute, please check the relevant section of the Tutor docs: `https://docs.tutor.edly.io/tutor.html#contributing <https://docs.tutor.edly.io/tutor.html#contributing>`__.
.. _readme_contributing_end: .. _readme_contributing_end:

2
changelog.d/scriv/github_release.md.j2
View File

@ -7,7 +7,7 @@ Or download the compiled binaries:
sudo curl -L "https://github.com/overhangio/tutor/releases/download/{{ version }}/tutor-$(uname -s)_$(uname -m)" -o /usr/local/bin/tutor sudo curl -L "https://github.com/overhangio/tutor/releases/download/{{ version }}/tutor-$(uname -s)_$(uname -m)" -o /usr/local/bin/tutor
sudo chmod 0755 /usr/local/bin/tutor sudo chmod 0755 /usr/local/bin/tutor
See the [installation docs](https://docs.tutor.overhang.io/install.html) for more installation options and instructions. See the [installation docs](https://docs.tutor.edly.io/install.html) for more installation options and instructions.
## Changes ## Changes

2
docs/troubleshooting.rst
View File

@ -91,7 +91,7 @@ If that doesn't work, then check if you have any other Docker containers running
docker ps -a docker ps -a
For example, if you have ever used `Tutor Nightly <https://docs.tutor.overhang.io/tutorials/nightly.html>`_, check whether you still have ``tutor_nightly_`` containers running. Conversely, if you're trying to run Tutor Nightly now, check whether you have non-Nightly ``tutor_`` containers running. If so, switch to that other version of Tutor, run ``tutor (dev|local|k8s) stop``, and then switch back to your preferred version of Tutor. For example, if you have ever used `Tutor Nightly <https://docs.tutor.edly.io/tutorials/nightly.html>`_, check whether you still have ``tutor_nightly_`` containers running. Conversely, if you're trying to run Tutor Nightly now, check whether you have non-Nightly ``tutor_`` containers running. If so, switch to that other version of Tutor, run ``tutor (dev|local|k8s) stop``, and then switch back to your preferred version of Tutor.
Alternatively, if there are any other non-Tutor containers using port 3306, then stop and remove them:: Alternatively, if there are any other non-Tutor containers using port 3306, then stop and remove them::

4
setup.py
View File

@ -41,9 +41,9 @@ ABOUT = load_about()
setup( setup(
name="tutor", name="tutor",
version=ABOUT["__package_version__"], version=ABOUT["__package_version__"],
url="https://docs.tutor.overhang.io/", url="https://docs.tutor.edly.io/",
project_urls={ project_urls={
"Documentation": "https://docs.tutor.overhang.io/", "Documentation": "https://docs.tutor.edly.io/",
"Code": "https://github.com/overhangio/tutor", "Code": "https://github.com/overhangio/tutor",
"Issue tracker": "https://github.com/overhangio/tutor/issues", "Issue tracker": "https://github.com/overhangio/tutor/issues",
"Community": "https://discuss.openedx.org/tag/tutor", "Community": "https://discuss.openedx.org/tag/tutor",

2
tutor/commands/compose.py
View File

@ -178,7 +178,7 @@ Are you sure you want to continue?"""
See the documentation for more information: See the documentation for more information:
https://docs.tutor.overhang.io/install.html#upgrading-to-a-new-open-edx-release https://docs.tutor.edly.io/install.html#upgrading-to-a-new-open-edx-release
Press enter when you are ready to continue""" Press enter when you are ready to continue"""
click.confirm( click.confirm(

2
tutor/utils.py
View File

@ -250,7 +250,7 @@ def warn_macos_docker_memory() -> None:
{e} {e}
Tutor may not work if Docker is configured with < 4 GB RAM. Please follow instructions from: Tutor may not work if Docker is configured with < 4 GB RAM. Please follow instructions from:
https://docs.tutor.overhang.io/install.html""" https://docs.tutor.edly.io/install.html"""
) )