mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/http-method-push-monitor

This commit is contained in:
Stefan Ottosson 2024-05-24 09:05:11 +02:00 committed by GitHub
parent df663a81cd 1590ca6c02
commit 9ce0911e34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/conflict_labeler.yml vendored
View File

@ -22,5 +22,4 @@ jobs:
uses: eps1lon/actions-label-merge-conflict@v3 uses: eps1lon/actions-label-merge-conflict@v3
with: with:
dirtyLabel: 'needs:resolve-merge-conflict' dirtyLabel: 'needs:resolve-merge-conflict'
removeOnDirtyLabel: 'needs:resolve-merge-conflict'
repoToken: '${{ secrets.GITHUB_TOKEN }}' repoToken: '${{ secrets.GITHUB_TOKEN }}'

7
src/pages/EditMonitor.vue
View File

@ -370,9 +370,10 @@
<label for="jsonPath" class="form-label">{{ $t("Json Query") }}</label> <label for="jsonPath" class="form-label">{{ $t("Json Query") }}</label>
<input id="jsonPath" v-model="monitor.jsonPath" type="text" class="form-control" required> <input id="jsonPath" v-model="monitor.jsonPath" type="text" class="form-control" required>
<!-- eslint-disable-next-line vue/no-v-html --> <i18n-t tag="div" class="form-text" keypath="jsonQueryDescription">
<div class="form-text" v-html="$t('jsonQueryDescription')"> <a href="https://jsonata.org/">jsonata.org</a>
</div> <a href="https://try.jsonata.org/">{{ $t('here') }}</a>
</i18n-t>
<br> <br>
<label for="expectedValue" class="form-label">{{ $t("Expected Value") }}</label> <label for="expectedValue" class="form-label">{{ $t("Expected Value") }}</label>