Merge branch 'master' into staging/bugfix

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 <!--
-Thank you for your interest into contributing to OctoPrint, it's
+Thank you for your interest in contributing to OctoPrint, it's
 highly appreciated!
 
 Please make sure you have read the "guidelines for contributing" as
 linked just above this form, there's a section on Pull Requests in there
-as well that contains important information.
+as well which contains important information.
 
 As a summary, please make sure you have ticked all points on this
 checklist:
@@ -16,25 +16,25 @@ checklist:
     made sure your changes don't interfere with current development by
     talking it through with the maintainers, e.g. through a
     Brainstorming ticket
-  * [ ] Your PR targets OctoPrint's devel branch if it's a completely
-    new feature, or maintenance if it's a bug fix or improvement of
+  * [ ] Your PR targets OctoPrint's `devel` branch if it's a completely
+    new feature, or `maintenance` if it's a bug fix or improvement of
     existing functionality for the current stable version (no PRs
-    against master or anything else please)
+    against `master` or anything else please)
   * [ ] Your PR was opened from a custom branch on your repository
-    (no PRs from your version of master, maintenance or devel please),
-    e.g. dev/my_new_feature or fix/my_bugfix
+    (no PRs from your version of `master`, `maintenance`, or `devel`
+    please), e.g. `dev/my_new_feature` or `fix/my_bugfix`
   * [ ] Your PR only contains relevant changes: no unrelated files,
     no dead code, ideally only one commit - rebase and squash your PR
     if necessary!
   * [ ] Your changes follow the existing coding style
   * [ ] If your changes include style sheets: You have modified the
-    .less source files, not the .css files (those are generated with
-    lessc)
+    `.less` source files, not the `.css` files (those are generated
+    with `lessc`)
   * [ ] You have tested your changes (please state how!) - ideally you
     have added unit tests
   * [ ] You have run the existing unit tests against your changes and
     nothing broke
-  * [ ] You have added yourself to the AUTHORS.md file :)
+  * [ ] You have added yourself to the `AUTHORS.md` file :)
 
 <!--
 Describe your PR further using the template provided below. The more

.github/workflows/add_to_backlog.yml

@@ -0,0 +1,20 @@
+name: Add issues/PRs to backlog automatically
+
+on:
+  issues:
+    types:
+      - opened
+      - transferred
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue or PR to OctoPrint Backlog project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/OctoPrint/projects/6
+          github-token: ${{ secrets.BACKLOG_PROJECT_ACCESS }}

.github/workflows/build.yml

@@ -96,6 +96,7 @@ jobs:
     name: 🧪 E2E tests
     needs: build
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: ⬇ Checkout code
         uses: actions/checkout@v2
@@ -141,7 +142,7 @@ jobs:
 
   publish-on-testpypi:
     name: 📦 Publish on TestPyPI
-    if: github.event_name == 'release'
+    if: github.event_name == 'release' && github.repository == 'OctoPrint/OctoPrint'
     needs:
       - pre-commit
       - test-unit
@@ -163,7 +164,7 @@ jobs:
 
   publish-on-pypi:
     name: 📦 Publish tagged releases to PyPI
-    if: github.event_name == 'release'
+    if: github.event_name == 'release' && github.repository == 'OctoPrint/OctoPrint'
     needs: publish-on-testpypi
     runs-on: ubuntu-latest
     steps:
@@ -179,7 +180,7 @@ jobs:
 
   notify-custopizer-build:
     name: 📧 Notify OctoPi-UpToDate
-    if: github.event_name == 'release'
+    if: github.event_name == 'release' && github.repository == 'OctoPrint/OctoPrint'
     needs: publish-on-pypi
     runs-on: ubuntu-latest
     steps:

.github/workflows/issue_automation.yml

@@ -28,6 +28,11 @@ jobs:
                   labels = labels.filter(label => label !== 'triage');
                   setLabels = true;
                 }
+                if (context.payload.issue.title.match(/\[task\]/i)) {
+                  labels.push('task');
+                  labels = labels.filter(label => label !== 'triage');
+                  setLabels = true;
+                }
 
                 if (labels.length === 0) {
                   labels.push('triage');
@@ -37,7 +42,7 @@ jobs:
               }
 
               case 'closed': {
-                if (labels.includes('bug') || labels.includes('request') || labels.includes('improvement')) {
+                if (labels.includes('bug') || labels.includes('request') || labels.includes('improvement') || labels.includes('task')) {
                   labels.push('done');
                   setLabels = true;
                 }

.github/workflows/test_install.yml

@@ -31,12 +31,14 @@ jobs:
         run: |
           pip install .
       - name: 📧 Discord success notification
+        continue-on-error: true
         env:
           DISCORD_WEBHOOK: ${{ secrets.discord_webhook }}
         uses: Ilshidur/action-discord@master
         with:
           args: "☑️ Test install on Python ${{ matrix.python }} under `${{ matrix.os }}` for `OctoPrint/OctoPrint:${{ matrix.branch }}` was successful"
       - name: 📧 Discord failure notification
+        continue-on-error: true
         if: failure()
         env:
           DISCORD_WEBHOOK: ${{ secrets.discord_webhook }}
@@ -65,12 +67,14 @@ jobs:
         run: |
           pip install https://github.com/OctoPrint/OctoPrint/archive/${{ steps.latest.outputs.release }}.zip
       - name: 📧 Discord success notification
+        continue-on-error: true
         env:
           DISCORD_WEBHOOK: ${{ secrets.discord_webhook }}
         uses: Ilshidur/action-discord@master
         with:
           args: "☑️ Test install on Python ${{ matrix.python }} under `${{ matrix.os }}` for `OctoPrint/OctoPrint:${{ steps.latest.outputs.release }}` was successful"
       - name: 📧 Discord failure notification
+        continue-on-error: true
         if: failure()
         env:
           DISCORD_WEBHOOK: ${{ secrets.discord_webhook }}

docs/api/timelapse.rst

@@ -76,7 +76,7 @@ Change current timelapse config
 .. http:post:: /api/timelapse
 
    Save a new :ref:`timelapse configuration <sec-api-timelapse-datamodel-config>` to use for the next print. Set the optional ``save`` flag in the
-   configuration to ``true`` in order to make the new configuration persist accross restarts.
+   configuration to ``true`` in order to make the new configuration persist across restarts.
 
    The configuration is expected as the request body.
 
@@ -220,7 +220,7 @@ Timelapse configuration
    * - ``save``
      - 1
      - bool
-     - Optional flag to be included when when saving a configuration to make the configuration persist accross restarts
+     - Optional flag to be included when when saving a configuration to make the configuration persist across restarts
 
 Further fields are timelapse type specific, see below for details.