🔂 Resolve conflicts

2024-11-23 04:34:44 +03:00 · 2024-02-26 14:38:58 +00:00 · 2024-02-26 14:38:58 +00:00 · 97a75b3643
commit 97a75b3643
parent 65c868693e 92f742a48a
12 changed files with 390 additions and 286 deletions
--- a/.github/AUTHORS.txt
+++ b/.github/AUTHORS.txt
@ -23,6 +23,7 @@ FedelloKirfed <fedellokirfed@proton.me> - 1 commits
 FormatToday <616099456@qq.com> - 1 commits
 Garrett Brown <gdbrown09@gmail.com> - 1 commits
 Harald Töpfer <62364169+hubortje@users.noreply.github.com> - 1 commits
+Hendrik Strydom <56320839+FraglyG@users.noreply.github.com> - 1 commits
 Ian Neal <wopr@wopr.tech> - 1 commits
 Iaroslav Dronskii <iaroslav@dronskii.ru> - 1 commits
 Ishan Jain <ishan@jain.se> - 1 commits
@ -70,6 +71,7 @@ jnach <33467747+jnach@users.noreply.github.com> - 1 commits
 jrobles98 <jose98_21@hotmail.com> - 1 commits
 kxenox <floriandel@msn.com> - 1 commits
 laker j.v <la@laker.gay> - 1 commits
+markxoe <mark@oude-elberink.de> - 1 commits
 pablomalo <paul.gouin50@gmail.com> - 1 commits
 poisonadder7 <github.com@loginz.uk> - 1 commits
 rtm516 <ryantmilner@hotmail.co.uk> - 1 commits
@ -80,6 +82,7 @@ sur1v <gsuriv@gmail.com> - 1 commits
 tazboyz16 <tazboyz_16@yahoo.com> - 1 commits
 zcq100 <zcq100@gmail.com> - 1 commits
 Ángel Fernández Sánchez <angelfx19@gmail.com> - 1 commits
+Al Saleh <alayham@alayham.com> - 2 commits
 Alejandro Pinar Ruiz <37040888+pinarruiz@users.noreply.github.com> - 2 commits
 Alessandro Del Prete <alessandro.delprete@gmail.com> - 2 commits
 Alexander Mnich <56564725+a-mnich@users.noreply.github.com> - 2 commits
@ -90,7 +93,6 @@ Dan Gilbert <ddg@daentech.co.uk> - 2 commits
 Denis Savosin <dsavosin@at-consulting.ru> - 2 commits
 Ruben Silva <rubensilva945@gmail.com> - 2 commits
 Thomas Dissert <dissertthomas@gmail.com> - 2 commits
-Tobias <96661824+CrazyWolf13@users.noreply.github.com> - 2 commits
 cauterize <cauterize@programmer.net> - 2 commits
 hockeymikey <hockeymikey@hockeymikey.com> - 2 commits
 itsmejoeeey <9375730+itsmejoeeey@users.noreply.github.com> - 2 commits
@ -120,19 +122,21 @@ Rémy GRANDIN <remy.gr@ndin.fr> - 4 commits
 Todd E Johnson <todd@toddejohnson.net> - 4 commits
 Totto16 <tobiausgais@gmail.com> - 4 commits
 Walkx <walkxnl@gmail.com> - 4 commits
-dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - 4 commits
 wozboz <philip@iuno.tech> - 4 commits
 Alberto Caravaca <3170731+albcp@users.noreply.github.com> - 5 commits
 Alicie <gh@d0h.co> - 5 commits
 Benjamin Montgomery <bmontgom@montynet.org> - 5 commits
 Chris Nielsen <nielsen.chris@gmail.com> - 5 commits
 UrekD <urek.denis@gmail.com> - 5 commits
+dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - 5 commits
 Erik Vroon <erik.vroon22@gmail.com> - 6 commits
 Jammo2k5 <jammo2k5@hotmail.co.uk> - 6 commits
 Leonardo Covarrubias <leos@leocov.com> - 6 commits
 Magnus Sundström <kmvsundstrom@gmail.com> - 6 commits
 kristian <kristianbrasel@gmail.com> - 6 commits
 liss-bot <liss-bot@users.noreply.github.com> - 6 commits
+Tobias <96661824+CrazyWolf13@users.noreply.github.com> - 7 commits
+Tobias <tobias.meier109@gmail.com> - 7 commits
 Josua Blejeru <josua@blejeru.com> - 8 commits
 Kashif Sohail <kashif.ezone@gmail.com> - 9 commits
 Alejandro Pinar Ruiz <alejandropinarruiz@gmail.com> - 14 commits
@ -146,10 +150,10 @@ Marcell Fülöp <marekful@protonmail.com> - 27 commits
 Alicia Sykes <alicia@futr.ai> - 28 commits
 Lissy93 <gh@d0h.co> - 78 commits
 snyk-bot <snyk-bot@snyk.io> - 83 commits
-repo-visualizer <repo-visualizer@users.noreply.github.com> - 125 commits
-Lissy93 <Lissy93@users.noreply.github.com> - 217 commits
-Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 227 commits
-liss-bot <liss-bot@d0h.co> - 228 commits
-Alicia Sykes <alicia@omg.lol> - 379 commits
+repo-visualizer <repo-visualizer@users.noreply.github.com> - 126 commits
+Lissy93 <Lissy93@users.noreply.github.com> - 219 commits
+Alicia Bot <87835202+liss-bot@users.noreply.github.com> - 229 commits
+liss-bot <liss-bot@d0h.co> - 230 commits
+Alicia Sykes <alicia@omg.lol> - 396 commits
 Alicia Sykes <gh@d0h.co> - 440 commits
 Alicia Sykes <sykes.alicia@gmail.com> - 1488 commits
--- a/.github/workflows/auto-tag-pr.yml
+++ b/.github/workflows/auto-tag-pr.yml
@ -8,6 +8,8 @@ on:
 jobs:
  tag-pre-release:
    runs-on: ubuntu-latest
+    permissions:
+      contents: write
    outputs:
      tag: ${{ steps.autotag.outputs.tagname }}
    steps:
@ -25,8 +27,9 @@ jobs:
    steps:
    - uses: actions/checkout@v2
    - uses: ncipollo/release-action@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
      with:
-        token: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
        tag: ${{ needs.tag-pre-release.outputs.tag }}
        bodyFile: ".github/LATEST_CHANGELOG.md"
  mark-issue-fixed:
--- a/README.md
+++ b/README.md
@ -154,6 +154,7 @@ Dashy supports **1-Click deployments** on several popular cloud platforms. To sp
 - [<img src="https://i.ibb.co/d2P1WZ7/heroku.png" width="18"/> Deploy to Heroku](https://heroku.com/deploy?template=https://github.com/Lissy93/dashy)
 - [<img src="https://i.ibb.co/Ld2FZzb/vercel.png" width="18"/> Deploy to Vercel](https://vercel.com/new/project?template=https://github.com/lissy93/dashy)
 - [<img src="https://i.ibb.co/xCHtzgh/render.png" width="18"/> Deploy to Render](https://render.com/deploy?repo=https://github.com/lissy93/dashy/tree/deploy_render)
+- [<img src="https://railway.app/brand/logo-light.png" width="18"/> Deploy to Railway](https://railway.app/template/MtdjAQ?referralCode=app)
 - [<img src="https://i.ibb.co/J7MGymY/googlecloud.png" width="18"/> Deploy to GCP](https://deploy.cloud.run/?git_repo=https://github.com/lissy93/dashy.git)
 - [<img src="https://i.ibb.co/HVWVYF7/docker.png" width="18"/> Deploy to PWD](https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/Lissy93/dashy/master/docker-compose.yml)
 - [<img src="https://i.ibb.co/7NxnM2P/easypanel.png" width="18"/> Deploy to Easypanel](https://easypanel.io/docs/templates/dashy)
@ -638,6 +639,13 @@ Huge thanks to the sponsors helping to support Dashy's development!
            <sub><b>Bastii717</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/frankdez93">
+            <img src="https://avatars.githubusercontent.com/u/87549420?v=4" width="80;" alt="frankdez93"/>
+            <br />
+            <sub><b>frankdez93</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/ratty222">
            <img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
@ -645,6 +653,14 @@ Huge thanks to the sponsors helping to support Dashy's development!
            <sub><b>Ratty222</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/hernanpopper">
+            <img src="https://avatars.githubusercontent.com/u/104868017?v=4" width="80;" alt="hernanpopper"/>
+            <br />
+            <sub><b>hernanpopper</b></sub>
+        </a>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/NixyJuppie">
            <img src="https://avatars.githubusercontent.com/u/138570196?u=b102c222487905728b858704962d32759df29ebe&v=4" width="80;" alt="NixyJuppie"/>
--- a/docs/assets/CONTRIBUTORS.svg
+++ b/docs/assets/CONTRIBUTORS.svg
--- a/docs/assets/repo-visualization.svg
+++ b/docs/assets/repo-visualization.svg
--- a/docs/configuring.md
+++ b/docs/configuring.md
@ -104,9 +104,9 @@ The following file provides a reference of all supported configuration options.
 **`startingView`** | `enum` | _Optional_ | Which page to load by default, and on the base page or domain root. You can still switch to different views from within the UI. Can be either `default`, `minimal` or `workspace`. Defaults to `default`
 **`defaultOpeningMethod`** | `enum` | _Optional_ | The default opening method for items, if no `target` is specified for a given item. Can be either `newtab`, `sametab`, `modal`, `workspace`, `clipboard`, `top` or `parent`. Defaults to `newtab`
 **`statusCheck`** | `boolean` | _Optional_ | When set to `true`, Dashy will ping each of your services and display their status as a dot next to each item. This can be overridden by setting `statusCheck` under each item. Defaults to `false`
-**`statusCheckInterval`** | `boolean` | _Optional_ | The number of seconds between checks. If set to `0` then service will only be checked on initial page load, which is usually the desired functionality. If value is less than `10` you may experience a hit in performance. Defaults to `0`
+**`statusCheckInterval`** | `number` | _Optional_ | The number of seconds between checks. If set to `0` then service will only be checked on initial page load, which is usually the desired functionality. If value is less than `10` you may experience a hit in performance. Defaults to `0`
 **`webSearch`** | `object` | _Optional_ | Configuration options for the web search feature, set your default search engine, opening method or disable web search. See [`webSearch`](#appconfigwebsearch-optional)
-**`backgroundImg`** | `string` | _Optional_ | Path to an optional full-screen app background image. This can be either remote (http) or local (/). Note that this will slow down initial load
+**`backgroundImg`** | `string` | _Optional_ | Path to an optional full-screen app background image. This can be either remote (http) or local (relative to /app/public/item-icons/ inside the container). Note that this will slow down initial load
 **`enableFontAwesome`** | `boolean` | _Optional_ | If set to `true` font-awesome will be loaded, if set to `false` they will not be. if left blank font-awesome will be enabled only if required by 1 or more icons
 **`enableMaterialDesignIcons`** | `boolean` | _Optional_ | If set to `true` mdi icons will be loaded, if set to `false` they will not be. Where `true` is enabled, if left blank material design icons will be enabled only if required by 1 or more icons
 **`fontAwesomeKey`** | `string` | _Optional_ | If you have a font-awesome key, then you can use it here and make use of premium icons. It is a 10-digit alpha-numeric string from you're FA kit URL  (e.g. `13014ae648`)
@ -246,7 +246,7 @@ For more info, see the **[Authentication Docs](/docs/authentication.md)**

 **[⬆️ Back to Top](#configuring)**

-## `section.widget` _(optional)_
+## `section.widgets` _(optional)_

 **Field** | **Type** | **Required**| **Description**
 --- | --- | --- | ---
--- a/docs/credits.md
+++ b/docs/credits.md
@ -111,6 +111,13 @@
            <sub><b>Null</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/frankdez93">
+            <img src="https://avatars.githubusercontent.com/u/87549420?v=4" width="80;" alt="frankdez93"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/ratty222">
            <img src="https://avatars.githubusercontent.com/u/92832598?u=137b65530cbd5f5af9c24cde51baa6cc77cc934b&v=4" width="80;" alt="ratty222"/>
@ -118,6 +125,14 @@
            <sub><b>Ratty222</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/hernanpopper">
+            <img src="https://avatars.githubusercontent.com/u/104868017?v=4" width="80;" alt="hernanpopper"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/NixyJuppie">
            <img src="https://avatars.githubusercontent.com/u/138570196?u=b102c222487905728b858704962d32759df29ebe&v=4" width="80;" alt="NixyJuppie"/>
@ -196,6 +211,13 @@
            <sub><b>Alejandro Pinar Ruiz</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/CrazyWolf13">
+            <img src="https://avatars.githubusercontent.com/u/96661824?v=4" width="80;" alt="CrazyWolf13"/>
+            <br />
+            <sub><b>Tobias</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/kashif-se">
            <img src="https://avatars.githubusercontent.com/u/5568138?v=4" width="80;" alt="kashif-se"/>
@ -216,27 +238,13 @@
            <br />
            <sub><b>Walkx</b></sub>
        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/albcp">
-            <img src="https://avatars.githubusercontent.com/u/3170731?v=4" width="80;" alt="albcp"/>
-            <br />
-            <sub><b>Alberto</b></sub>
-        </a>
    </td></tr>
 <tr>
    <td align="center">
-        <a href="https://github.com/Cereal916">
-            <img src="https://avatars.githubusercontent.com/u/7526937?v=4" width="80;" alt="Cereal916"/>
+        <a href="https://github.com/evroon">
+            <img src="https://avatars.githubusercontent.com/u/11857441?v=4" width="80;" alt="evroon"/>
            <br />
-            <sub><b>Kristian Brasel</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/lordpansar">
-            <img src="https://avatars.githubusercontent.com/u/14231148?v=4" width="80;" alt="lordpansar"/>
-            <br />
-            <sub><b>Magnus Sundström</b></sub>
+            <sub><b>Erik Vroon</b></sub>
        </a>
    </td>
    <td align="center">
@ -247,10 +255,24 @@
        </a>
    </td>
    <td align="center">
-        <a href="https://github.com/evroon">
-            <img src="https://avatars.githubusercontent.com/u/11857441?v=4" width="80;" alt="evroon"/>
+        <a href="https://github.com/lordpansar">
+            <img src="https://avatars.githubusercontent.com/u/14231148?v=4" width="80;" alt="lordpansar"/>
            <br />
-            <sub><b>Erik Vroon</b></sub>
+            <sub><b>Magnus Sundström</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/Cereal916">
+            <img src="https://avatars.githubusercontent.com/u/7526937?v=4" width="80;" alt="Cereal916"/>
+            <br />
+            <sub><b>Kristian Brasel</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/albcp">
+            <img src="https://avatars.githubusercontent.com/u/3170731?v=4" width="80;" alt="albcp"/>
+            <br />
+            <sub><b>Alberto</b></sub>
        </a>
    </td>
    <td align="center">
@ -259,15 +281,15 @@
            <br />
            <sub><b>Chris Nielsen</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/UrekD">
            <img src="https://avatars.githubusercontent.com/u/38784343?v=4" width="80;" alt="UrekD"/>
            <br />
            <sub><b>UrekD</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/wozboz">
            <img src="https://avatars.githubusercontent.com/u/51856582?v=4" width="80;" alt="wozboz"/>
@ -302,15 +324,15 @@
            <br />
            <sub><b>David Alasow</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/aviolaris">
            <img src="https://avatars.githubusercontent.com/u/48277853?v=4" width="80;" alt="aviolaris"/>
            <br />
            <sub><b>Andreas Violaris</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/rubenandre">
            <img src="https://avatars.githubusercontent.com/u/9402773?v=4" width="80;" alt="rubenandre"/>
@ -345,15 +367,15 @@
            <br />
            <sub><b>Stanly0726</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/Bogyie">
            <img src="https://avatars.githubusercontent.com/u/82003678?v=4" width="80;" alt="Bogyie"/>
            <br />
            <sub><b>Bogyeong Kim</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/Tuzi555">
            <img src="https://avatars.githubusercontent.com/u/62188066?v=4" width="80;" alt="Tuzi555"/>
@ -388,15 +410,15 @@
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/mmihaly">
            <img src="https://avatars.githubusercontent.com/u/50031464?v=4" width="80;" alt="mmihaly"/>
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/patrickheeney">
            <img src="https://avatars.githubusercontent.com/u/1407228?v=4" width="80;" alt="patrickheeney"/>
@ -431,21 +453,14 @@
            <br />
            <sub><b>Joey Miller</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/hockeymikey">
            <img src="https://avatars.githubusercontent.com/u/1435185?v=4" width="80;" alt="hockeymikey"/>
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td></tr>
-<tr>
-    <td align="center">
-        <a href="https://github.com/CrazyWolf13">
-            <img src="https://avatars.githubusercontent.com/u/96661824?v=4" width="80;" alt="CrazyWolf13"/>
-            <br />
-            <sub><b>Tobias</b></sub>
-        </a>
    </td>
    <td align="center">
        <a href="https://github.com/thomaswienecke">
@ -497,6 +512,13 @@
            <sub><b>Alessandro Del Prete</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/alayham">
+            <img src="https://avatars.githubusercontent.com/u/518776?v=4" width="80;" alt="alayham"/>
+            <br />
+            <sub><b>Al-Ayham Saleh</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/sachahjkl">
            <img src="https://avatars.githubusercontent.com/u/32895534?v=4" width="80;" alt="sachahjkl"/>
@ -517,15 +539,15 @@
            <br />
            <sub><b>Shawn Salat</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/royshreyaa">
            <img src="https://avatars.githubusercontent.com/u/139828242?v=4" width="80;" alt="royshreyaa"/>
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/Smexhy">
            <img src="https://avatars.githubusercontent.com/u/4880625?v=4" width="80;" alt="Smexhy"/>
@ -555,20 +577,20 @@
        </a>
    </td>
    <td align="center">
-        <a href="https://github.com/AmadeusGraves">
-            <img src="https://avatars.githubusercontent.com/u/18572939?v=4" width="80;" alt="AmadeusGraves"/>
+        <a href="https://github.com/XertDev">
+            <img src="https://avatars.githubusercontent.com/u/16572811?v=4" width="80;" alt="XertDev"/>
            <br />
-            <sub><b>Ángel Fernández Sánchez</b></sub>
+            <sub><b>Xert</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/turnrye">
            <img src="https://avatars.githubusercontent.com/u/701035?v=4" width="80;" alt="turnrye"/>
            <br />
            <sub><b>Ryan Turner</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/rubjo">
            <img src="https://avatars.githubusercontent.com/u/42270947?v=4" width="80;" alt="rubjo"/>
@ -603,20 +625,27 @@
            <br />
            <sub><b>Nicholas Malcolm</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/miclav">
            <img src="https://avatars.githubusercontent.com/u/11891522?v=4" width="80;" alt="miclav"/>
            <br />
            <sub><b>Michael Lavaire</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
-        <a href="https://github.com/FormatToday">
-            <img src="https://avatars.githubusercontent.com/u/20515769?v=4" width="80;" alt="FormatToday"/>
+        <a href="https://github.com/imsakg">
+            <img src="https://avatars.githubusercontent.com/u/62212589?v=4" width="80;" alt="imsakg"/>
            <br />
-            <sub><b>FormatToday</b></sub>
+            <sub><b>Mert Sefa AKGUN</b></sub>
+        </a>
+    </td>
+    <td align="center">
+        <a href="https://github.com/AmadeusGraves">
+            <img src="https://avatars.githubusercontent.com/u/18572939?v=4" width="80;" alt="AmadeusGraves"/>
+            <br />
+            <sub><b>Ángel Fernández Sánchez</b></sub>
        </a>
    </td>
    <td align="center">
@ -639,7 +668,8 @@
            <br />
            <sub><b>Soaibuzzaman</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/pablomalo">
            <img src="https://avatars.githubusercontent.com/u/25877142?v=4" width="80;" alt="pablomalo"/>
@ -647,14 +677,20 @@
            <sub><b>Null</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/markxoe">
+            <img src="https://avatars.githubusercontent.com/u/59475466?v=4" width="80;" alt="markxoe"/>
+            <br />
+            <sub><b>Mark Oude Elberink</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/lxjv">
            <img src="https://avatars.githubusercontent.com/u/63261955?v=4" width="80;" alt="lxjv"/>
            <br />
            <sub><b>Laker Turner</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/kxenoxx">
            <img src="https://avatars.githubusercontent.com/u/9744900?v=4" width="80;" alt="kxenoxx"/>
@ -675,7 +711,8 @@
            <br />
            <sub><b>Jnach</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/imlonghao">
            <img src="https://avatars.githubusercontent.com/u/4951333?v=4" width="80;" alt="imlonghao"/>
@ -696,8 +733,7 @@
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/flechaig">
            <img src="https://avatars.githubusercontent.com/u/10887132?v=4" width="80;" alt="flechaig"/>
@ -718,7 +754,8 @@
            <br />
            <sub><b>Null</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/allozavrr">
            <img src="https://avatars.githubusercontent.com/u/63748214?v=4" width="80;" alt="allozavrr"/>
@ -727,10 +764,10 @@
        </a>
    </td>
    <td align="center">
-        <a href="https://github.com/XertDev">
-            <img src="https://avatars.githubusercontent.com/u/16572811?v=4" width="80;" alt="XertDev"/>
+        <a href="https://github.com/FormatToday">
+            <img src="https://avatars.githubusercontent.com/u/20515769?v=4" width="80;" alt="FormatToday"/>
            <br />
-            <sub><b>Xert</b></sub>
+            <sub><b>FormatToday</b></sub>
        </a>
    </td>
    <td align="center">
@ -739,8 +776,7 @@
            <br />
            <sub><b>Ethan Hann</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/emiran-orange">
            <img src="https://avatars.githubusercontent.com/u/71817149?v=4" width="80;" alt="emiran-orange"/>
@ -761,7 +797,8 @@
            <br />
            <sub><b>Dylan Bersans</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/dougaldhub">
            <img src="https://avatars.githubusercontent.com/u/25713235?v=4" width="80;" alt="dougaldhub"/>
@ -782,8 +819,7 @@
            <br />
            <sub><b>DeepSource Bot</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/DawidPietrykowski">
            <img src="https://avatars.githubusercontent.com/u/53954695?v=4" width="80;" alt="DawidPietrykowski"/>
@ -804,7 +840,8 @@
            <br />
            <sub><b>Bumsoo Kim</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/BhasherBEL">
            <img src="https://avatars.githubusercontent.com/u/45831883?v=4" width="80;" alt="BhasherBEL"/>
@ -825,8 +862,7 @@
            <br />
            <sub><b>Jyotirmoy Bandyopadhyaya [Bravo68]</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/AaronPorts">
            <img src="https://avatars.githubusercontent.com/u/32810520?v=4" width="80;" alt="AaronPorts"/>
@ -847,14 +883,8 @@
            <br />
            <sub><b>0n1cOn3</b></sub>
        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/imsakg">
-            <img src="https://avatars.githubusercontent.com/u/62212589?v=4" width="80;" alt="imsakg"/>
-            <br />
-            <sub><b>Mert Sefa AKGUN</b></sub>
-        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/maximemoreillon">
            <img src="https://avatars.githubusercontent.com/u/29086128?v=4" width="80;" alt="maximemoreillon"/>
@ -868,8 +898,7 @@
            <br />
            <sub><b>Max Kulik</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/markusdd">
            <img src="https://avatars.githubusercontent.com/u/25175069?v=4" width="80;" alt="markusdd"/>
@ -897,7 +926,8 @@
            <br />
            <sub><b>Leonardo Colman Lopes</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/KierenConnell">
            <img src="https://avatars.githubusercontent.com/u/46445781?v=4" width="80;" alt="KierenConnell"/>
@ -911,8 +941,7 @@
            <br />
            <sub><b>Kieran</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/Singebob">
            <img src="https://avatars.githubusercontent.com/u/24290044?v=4" width="80;" alt="Singebob"/>
@ -940,7 +969,8 @@
            <br />
            <sub><b>Ishan Jain</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/Compunctus">
            <img src="https://avatars.githubusercontent.com/u/5058853?v=4" width="80;" alt="Compunctus"/>
@ -954,8 +984,14 @@
            <br />
            <sub><b>Ian Neal</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
+    <td align="center">
+        <a href="https://github.com/FraglyG">
+            <img src="https://avatars.githubusercontent.com/u/56320839?v=4" width="80;" alt="FraglyG"/>
+            <br />
+            <sub><b>Hendrik Strydom</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/hubortje">
            <img src="https://avatars.githubusercontent.com/u/62364169?v=4" width="80;" alt="hubortje"/>
--- a/docs/deployment.md
+++ b/docs/deployment.md
@ -33,6 +33,7 @@ Once you've got Dashy up and running, you'll want to configure it with your own
    - [Google Cloud Platform](#google-cloud-platform)
    - [Platform.sh](#platformsh)
    - [Render](#render)
+    - [Railway](#railway)
    - [Scalingo](#scalingo)
    - [Play-with-Docker](#play-with-docker)
    - [Surge.sh](#surgesh)
@ -279,6 +280,16 @@ To deploy Dashy to Render, use the following link
 https://render.com/deploy?repo=https://github.com/lissy93/dashy/tree/deploy_render
 ```

+### Railway
+
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/MtdjAQ?referralCode=app)
+
+[Railway](https://railway.app/) is a Platform as a Service (PaaS) that offers a complete platform for building and delivering programs to the backend of the cloud. You bring your code and Railway does the rest. Railway offers an extremely good developer experience and makes it effortless to deploy apps. Railway offers a free Trial Plan, and paid plans start at $5/month. Railway has 4 server locations: US-west, US-east, EU-west and ASIA-South-East.
+
+```text
+https://railway.app/template/MtdjAQ
+```
+
 ### Scalingo

 [![Deploy on Scalingo](https://i.ibb.co/nj0KxyH/deploy-scalingo-button.png)](https://my.scalingo.com/deploy?source=https://github.com/lissy93/dashy#master)
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@ -7,6 +7,7 @@

 ## Contents

+- [Config not saving](#config-not-saving)
 - [Refused to Connect in Web Content View](#refused-to-connect-in-modal-or-workspace-view)
 - [404 On Static Hosting](#404-on-static-hosting)
 - [404 from Mobile Home Screen](#404-after-launch-from-mobile-home-screen)
@ -46,6 +47,25 @@

 ---

+## Config not saving
+
+### Possible Issue 1: Unable to call save endpoint from CDN/static server
+If you're running Dashy using a static hosting provider (like Vercel), then there is no Node server, and so the save config action will not work via the UI.
+You'll instead need to copy the YAML after making your changes, and paste that into your `conf.yml` directly. If you've connected Vercel to git, then these changes will take effect automatically, once you commit your changes. 
+Look here for more information: [https://dashy.to/docs/deployment#deploy-to-cloud-service](https://dashy.to/docs/deployment#deploy-to-cloud-service)
+
+If you're running on Netlify, there are some cloud functions which take care of all the server endpoints (like status checking), so these will work as expected.
+
+See also [#1465](https://github.com/Lissy93/dashy/issues/1465)
+
+### Possible Issue 2: Unable to save
+In Docker, double check that the file isn't read-only, and that the container actually has permissions to modify it. You shouldn't really be running it as a root user, and I'm not sure if it will work if you do-
+
+### Possible Issue 3: Saved but not updating
+After saving, the frontend will recompile, which may take a couple seconds (or a bit longer on a Pi or low-powered device). If it doesn't recompile, you can manually trigger a re-build.
+
+---
+
 ## `Refused to Connect` in Modal or Workspace View

 This is not an issue with Dashy, but instead caused by the target app preventing direct access through embedded elements.
@ -549,8 +569,7 @@ For example:
 export NODE_OPTIONS=--openssl-legacy-provider
 ```

-For more info, see [webpack/webpack#14532](https://github.com/webpack/webpack/issues/14532) and [nodejs/node#40455](https://github.com/nodejs/node/issues/40455). 
-This occurs because [Node 17+](https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382) no longer supports MD4 as hash function, we're in the process of upgrading Dashy dependencies to all use SHA1 for hashing bundle IDs.
+This will be fixed once [webpack/webpack#17659](https://github.com/webpack/webpack/pull/17659) is merged.

 ---

--- a/docs/widgets.md
+++ b/docs/widgets.md
@ -2130,6 +2130,11 @@ This will show the list of VMs, with a title and a linked fotter, hiding VM temp
      footer_as_link: true
      hide_templates: 1
 ```
+#### Troubleshooting
+- **404 Error in development mode**: The error might disappear in production mode `yarn start`
+- **500 Error in production mode**: Try adding the certificate authority (CA) certificate of your Proxmox host to Node.js. 
+  - Download the Proxmox CA certificate to your Dashy host.
+  - Export environment variable `NODE_EXTRA_CA_CERTS` and set its value to the path of the downloaded CA certificate. Example:  `export NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/devlab_ca.pem`
 #### Info

 - **CORS**: 🟠 Proxied
--- a/src/components/Widgets/Jokes.vue
+++ b/src/components/Widgets/Jokes.vue
@ -74,6 +74,7 @@ export default {
        this.jokeLine2 = data.delivery;
      } else if (this.jokeType === 'single') {
        this.jokeLine1 = data.joke;
+        this.jokeLine2 = null;
      }
    },
  },
--- a/src/components/Widgets/Proxmox.vue
+++ b/src/components/Widgets/Proxmox.vue
@ -94,7 +94,7 @@ export default {
      }
    },
    processData(data) {
-      this.data = data.data.sort((a, b) => a.vmid > b.vmid);
+      this.data = data.data.sort((a, b) => Number(a.vmid) > Number(b.vmid));
      if (this.hideTemplates) {
        this.data = this.data.filter(item => item.template !== 1);
      }