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

.github/workflows/conflict_labeler.yml

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

src/pages/EditMonitor.vue

@@ -370,9 +370,10 @@
                                     <label for="jsonPath" class="form-label">{{ $t("Json Query") }}</label>
                                     <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>
 
                                     <label for="expectedValue" class="form-label">{{ $t("Expected Value") }}</label>