tyler.durden
/
dashy
mirror of https://github.com/Lissy93/dashy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

⏪ branch 'master' of github.com:Lissy93/dashy

This commit is contained in:
Alicia Sykes 2021-12-05 19:24:52 +00:00
parent 85648bc32f f8ec2cc73c
commit 49b405a717
10 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/AUTHORS.txt vendored
View File

@ -10,23 +10,24 @@ Ryan <urne> - 1 commits
Shreya <o> - 1 commits
deepsource-io[bot] <deepsource-io[bot]@users.noreply.github.com> - 1 commits
jnach <33467747+jnach@users.noreply.github.com> - 1 commits
Brendan <&#39;Lear> - 2 commits
Dan <ilber> - 2 commits
liss-bot <87835202+liss-bot@users.noreply.github.com> - 2 commits
ᗪєνιη <υн> - 2 commits
Niklas <abe> - 4 commits
UrekD <urek.denis@gmail.com> - 4 commits
UrekD <urek.denis@gmail.com> - 5 commits
Erik <roo> - 6 commits
liss-bot <liss-bot@users.noreply.github.com> - 6 commits
repo-visualizer <repo-visualizer@users.noreply.github.com> - 11 commits
snyk-bot <snyk-bot@snyk.io> - 11 commits
repo-visualizer <repo-visualizer@users.noreply.github.com> - 14 commits
Alicia <yke> - 16 commits
github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - 16 commits
snyk-bot <snyk-bot@snyk.io> - 16 commits
snyk-bot <snyk-bot@users.noreply.github.com> - 18 commits
Alicia <o> - 20 commits
EVOTk <45015615+EVOTk@users.noreply.github.com> - 21 commits
EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits
Alicia <o> - 25 commits
Alicia <yke> - 25 commits
liss-bot <liss-bot@d0h.co> - 29 commits
liss-bot <liss-bot@d0h.co> - 37 commits
Lissy93 <gh@d0h.co> - 78 commits
Lissy93 <Lissy93@users.noreply.github.com> - 201 commits
Alicia <yke> - 277 commits
Alicia <yke> - 1168 commits
Alicia <yke> - 285 commits
Alicia <yke> - 1182 commits

20
README.md
View File

@ -463,17 +463,10 @@ Huge thanks to the sponsors helping to support Dashy's development!
<table>
<tr>
<td align="center">
<a href="https://github.com/mfnalex">
<img src="https://avatars.githubusercontent.com/u/1122571?u=5503223f5a5077197ddc229a938a5c3120a276ce&v=4" width="80;" alt="mfnalex"/>
<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>Mfnalex</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Robert-Ernst">
<img src="https://avatars.githubusercontent.com/u/9050259?u=7253b4063f1ffe3b5a894263c8b2056151802508&v=4" width="80;" alt="Robert-Ernst"/>
<br />
<sub><b>Robert Ernst</b></sub>
<sub><b>Vlad Timofeev</b></sub>
</a>
</td>
<td align="center">
@ -482,6 +475,13 @@ Huge thanks to the sponsors helping to support Dashy's development!
<br />
<sub><b>DylanH</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/matthewjdegarmo">
<img src="https://avatars.githubusercontent.com/u/46715299?u=65f979e86de9dce8a5fe04df9775d32c6cefd73a&v=4" width="80;" alt="matthewjdegarmo"/>
<br />
<sub><b>Matthew J. DeGarmo</b></sub>
</a>
</td></tr>
</table>
<!-- readme: sponsors -end -->

22
docs/assets/CONTRIBUTORS.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 MiB

After

Width:  |  Height:  |  Size: 3.2 MiB

2
docs/assets/repo-visualization.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

34
docs/credits.md
View File

@ -5,17 +5,10 @@
<table>
<tr>
<td align="center">
<a href="https://github.com/mfnalex">
<img src="https://avatars.githubusercontent.com/u/1122571?u=5503223f5a5077197ddc229a938a5c3120a276ce&v=4" width="80;" alt="mfnalex"/>
<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>Mfnalex</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Robert-Ernst">
<img src="https://avatars.githubusercontent.com/u/9050259?u=7253b4063f1ffe3b5a894263c8b2056151802508&v=4" width="80;" alt="Robert-Ernst"/>
<br />
<sub><b>Robert Ernst</b></sub>
<sub><b>Vlad Timofeev</b></sub>
</a>
</td>
<td align="center">
@ -24,6 +17,13 @@
<br />
<sub><b>DylanH</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/matthewjdegarmo">
<img src="https://avatars.githubusercontent.com/u/46715299?u=65f979e86de9dce8a5fe04df9775d32c6cefd73a&v=4" width="80;" alt="matthewjdegarmo"/>
<br />
<sub><b>Matthew J. DeGarmo</b></sub>
</a>
</td></tr>
</table>
<!-- readme: sponsors -end -->
@ -53,13 +53,6 @@
<sub><b>EVOTk</b></sub>
</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"/>
<br />
<sub><b>Erik Vroon</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/snyk-bot">
<img src="https://avatars.githubusercontent.com/u/19733683?v=4" width="80;" alt="snyk-bot"/>
@ -67,6 +60,13 @@
<sub><b>Snyk Bot</b></sub>
</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"/>
<br />
<sub><b>Erik Vroon</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/UrekD">
<img src="https://avatars.githubusercontent.com/u/38784343?v=4" width="80;" alt="UrekD"/>

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "Dashy",
"version": "1.9.2",
"version": "1.9.3",
"license": "MIT",
"main": "server",
"author": "Alicia Sykes <alicia@omg.lol> (https://aliciasykes.com)",

1
src/assets/locales/en.json
View File

@ -19,6 +19,7 @@
"remember-me-hour": "4 Hours",
"remember-me-day": "1 Day",
"remember-me-week": "1 Week",
"remember-me-long-time": "A long time",
"error-missing-username": "Missing Username",
"error-missing-password": "Missing Password",
"error-incorrect-username": "User not found",

1
src/assets/locales/fr.json
View File

@ -19,6 +19,7 @@
"remember-me-hour": "4 Heures",
"remember-me-day": "1 Jour",
"remember-me-week": "1 Semaine",
"remember-me-long-time": "Un long moment",
"error-missing-username": "Nom d'utilisateur manquant",
"error-missing-password": "Mot de passe manquant",
"error-incorrect-username": "Utilisateur inexistant",

3
src/components/InteractiveEditor/EditItem.vue
View File

@ -227,6 +227,9 @@ export default {
};
if (newItem.tags) newItem.tags = strToTags(newItem.tags);
if (newItem.statusCheck) newItem.statusCheck = strToBool(newItem.statusCheck);
if (newItem.statusCheckAllowInsecure) {
newItem.statusCheckAllowInsecure = strToBool(newItem.statusCheckAllowInsecure);
}
// if (newItem.hotkey) newItem.hotkey = parseInt(newItem.hotkey, 10);
return newItem;
},

1
src/views/Login.vue
View File

@ -111,6 +111,7 @@ export default {
{ label: this.$t('login.remember-me-hour'), time: 14400 * 1000 },
{ label: this.$t('login.remember-me-day'), time: 86400 * 1000 },
{ label: this.$t('login.remember-me-week'), time: 604800 * 1000 },
{ label: this.$t('login.remember-me-long-time'), time: 604800 * 52 * 1000 },
];
},
/* Translations for login response messages */