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

Merge branch 'master' of github.com:Lissy93/dashy into FEATURE/multi-page-support-2

This commit is contained in:
Alicia Sykes 2022-04-18 19:42:30 +01:00
parent 07f6bfeddc 05f5d71801
commit cf7587b4ee
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/AUTHORS.txt vendored
View File

@ -41,12 +41,12 @@ snyk-bot <snyk-bot@users.noreply.github.com> - 18 commits
aterox <church.kennetha@gmail.com> - 19 commits aterox <church.kennetha@gmail.com> - 19 commits
EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits
Alicia <yke> - 28 commits Alicia <yke> - 28 commits
repo-visualizer <repo-visualizer@users.noreply.github.com> - 31 commits repo-visualizer <repo-visualizer@users.noreply.github.com> - 32 commits
snyk-bot <snyk-bot@snyk.io> - 38 commits snyk-bot <snyk-bot@snyk.io> - 38 commits
Alicia <o> - 64 commits Alicia <o> - 65 commits
Lissy93 <gh@d0h.co> - 78 commits Lissy93 <gh@d0h.co> - 78 commits
liss-bot <liss-bot@d0h.co> - 78 commits liss-bot <liss-bot@d0h.co> - 80 commits
Alicia <yke> - 93 commits Alicia <yke> - 97 commits
Lissy93 <Lissy93@users.noreply.github.com> - 206 commits Lissy93 <Lissy93@users.noreply.github.com> - 206 commits
Alicia <yke> - 334 commits Alicia <yke> - 334 commits
Alicia <yke> - 1471 commits Alicia <yke> - 1482 commits

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: 86 KiB

After

Width:  |  Height:  |  Size: 105 KiB

2
docs/deployment.md
View File

@ -89,7 +89,7 @@ services:
container_name: Dashy container_name: Dashy
# Pass in your config file below, by specifying the path on your host machine # Pass in your config file below, by specifying the path on your host machine
# volumes: # volumes:
# - /root/my-config.yml:/public/conf.yml # - /root/my-config.yml:/app/public/conf.yml
ports: ports:
- 4000:80 - 4000:80
# Set any environmental variables # Set any environmental variables

2
src/mixins/ItemMixin.js
View File

@ -58,7 +58,7 @@ export default {
return interval; return interval;
}, },
accumulatedTarget() { accumulatedTarget() {
return this.target || this.appConfig.defaultOpeningMethod || defaultOpeningMethod; return this.item.target || this.appConfig.defaultOpeningMethod || defaultOpeningMethod;
}, },
/* Convert config target value, into HTML anchor target attribute */ /* Convert config target value, into HTML anchor target attribute */
anchorTarget() { anchorTarget() {