Skip to content

Commit

Permalink
Merge branch 'Lissy93:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
BySempron authored Jan 28, 2023
2 parents 728eb02 + 8fbffd3 commit c7c4df7
Show file tree
Hide file tree
Showing 18 changed files with 1,621 additions and 147 deletions.
15 changes: 8 additions & 7 deletions .github/AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Steffen <chmid> - 1 commits
Steven <as> - 1 commits
Xert <xertdev@gmail.com> - 1 commits
deepsource-io[bot] <deepsource-io[bot]@users.noreply.github.com> - 1 commits
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> - 1 commits
dr460nf1r3 <njcrypted@protonmail.com> - 1 commits
flechaig <flechaig@users.noreply.github.com> - 1 commits
icy-comet <50461557+icy-comet@users.noreply.github.com> - 1 commits
Expand All @@ -58,20 +57,21 @@ BOZG <sr@bozg.se> - 2 commits
Brendan <&#39;Lear> - 2 commits
CHAIYEON <H> - 2 commits
Dan <ilber> - 2 commits
Matthias <ilge> - 2 commits
Ruben <ilv> - 2 commits
Thomas <isser> - 2 commits
cauterize <cauterize@programmer.net> - 2 commits
k073l <21180271+k073l@users.noreply.github.com> - 2 commits
liss-bot <87835202+liss-bot@users.noreply.github.com> - 2 commits
patrickheeney <patrickheeney@gmail.com> - 2 commits
rtm516 <rtm516@users.noreply.github.com> - 2 commits
ᗪєνιη <υн> - 2 commits
Alucarddelta <dreyer.brent@gmail.com> - 3 commits
Tuzi555 <jakub.tuzar@gmail.com> - 3 commits
Walkx <71191962+walkxcode@users.noreply.github.com> - 3 commits
aterox <kenneth@kenneth.church> - 3 commits
bogyeong <boggyhint@gmail.com> - 3 commits
stanly0726 <37040069+stanly0726@users.noreply.github.com> - 3 commits
Alberto <aravac> - 4 commits
David <laso> - 4 commits
Lissy93 <alicia@omg.lol> - 4 commits
Niklas <abe> - 4 commits
Expand All @@ -91,17 +91,18 @@ Kashif <ohai> - 9 commits
Alejandro <ina> - 14 commits
Alicia <yke> - 16 commits
github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - 16 commits
Matthias <ilge> - 17 commits
snyk-bot <snyk-bot@users.noreply.github.com> - 18 commits
aterox <church.kennetha@gmail.com> - 19 commits
EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits
Marcell <ülö> - 24 commits
Alicia <yke> - 28 commits
repo-visualizer <repo-visualizer@users.noreply.github.com> - 70 commits
snyk-bot <snyk-bot@snyk.io> - 74 commits
repo-visualizer <repo-visualizer@users.noreply.github.com> - 72 commits
snyk-bot <snyk-bot@snyk.io> - 75 commits
Lissy93 <gh@d0h.co> - 78 commits
Alicia <o> - 128 commits
liss-bot <liss-bot@d0h.co> - 140 commits
Alicia <o> - 134 commits
liss-bot <liss-bot@d0h.co> - 144 commits
Lissy93 <Lissy93@users.noreply.github.com> - 208 commits
Alicia <yke> - 250 commits
Alicia <yke> - 257 commits
Alicia <yke> - 440 commits
Alicia <yke> - 1488 commits
5 changes: 3 additions & 2 deletions .github/workflows/generate-credits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@ jobs:
runs-on: ubuntu-latest
name: Inserts contributors into credits.md
steps:
- name: Contribute List - Credits Page
uses: akhilmhdh/contributors-readme-action@v2.2
- name: Contributer List - Credits Page
uses: akhilmhdh/contributors-readme-action@v2.3.6
env:
GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
with:
image_size: 80
readme_path: docs/credits.md
columns_per_row: 6
commit_message: ':purple_heart: Updates contributors list'
collaborators: all
committer_username: liss-bot
committer_email: liss-bot@d0h.co
- name: Sponsors List - Readme
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ CMD [ "yarn", "start" ]
EXPOSE ${PORT}

# Run simple healthchecks every 5 mins, to check that everythings still great
HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check
HEALTHCHECK --interval=5m --timeout=5s --start-period=30s CMD yarn health-check
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -552,28 +552,21 @@ Huge thanks to the sponsors helping to support Dashy's development!
<sub><b>Eddy Lazzarin</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Geolim4">
<img src="https://avatars.githubusercontent.com/u/1332071?u=5d84984897f094932c4829583fee19b121f3aab8&v=4" width="80;" alt="Geolim4"/>
<br />
<sub><b>Georges.L</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/AnandChowdhary">
<img src="https://avatars.githubusercontent.com/u/2841780?u=ca8e292b15abcc6cddaeae0abded0115c51b4789&v=4" width="80;" alt="AnandChowdhary"/>
<br />
<sub><b>Anand Chowdhary</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/davidpaulyoung">
<img src="https://avatars.githubusercontent.com/u/3418369?v=4" width="80;" alt="davidpaulyoung"/>
<br />
<sub><b>David Young</b></sub>
</a>
</td>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/k-rol">
<img src="https://avatars.githubusercontent.com/u/4050412?u=1162510eec7b7aeb31d4c7c65d51d4f773d823b0&v=4" width="80;" alt="k-rol"/>
Expand Down Expand Up @@ -608,14 +601,21 @@ Huge thanks to the sponsors helping to support Dashy's development!
<br />
<sub><b>Brian McGonagill</b></sub>
</a>
</td></tr>
<tr>
</td>
<td align="center">
<a href="https://github.com/vlad-timofeev">
<img src="https://avatars.githubusercontent.com/u/11474041?v=4" width="80;" alt="vlad-timofeev"/>
<br />
<sub><b>Vlad Timofeev</b></sub>
</a>
</td></tr>
<tr>
<td align="center">
<a href="https://github.com/iJasonWade">
<img src="https://avatars.githubusercontent.com/u/12824479?v=4" width="80;" alt="iJasonWade"/>
<br />
<sub><b>Jason Ash</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/PAPAMICA">
Expand Down
151 changes: 77 additions & 74 deletions docs/assets/CONTRIBUTORS.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/assets/repo-visualization.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c7c4df7

Please sign in to comment.