mirror of
				https://github.com/louislam/uptime-kuma.git
				synced 2025-11-04 13:46:13 +08:00 
			
		
		
		
	Merge branch 'master' into scroll-into-view
This commit is contained in:
		@@ -10,6 +10,10 @@
 | 
			
		||||
                    <br>
 | 
			
		||||
                    <span>{{ $t("Keyword") }}:</span> <span class="keyword">{{ monitor.keyword }}</span>
 | 
			
		||||
                </span>
 | 
			
		||||
                <span v-if="monitor.type === 'dns'">[{{ monitor.dns_resolve_type }}] {{ monitor.hostname }}
 | 
			
		||||
                    <br>
 | 
			
		||||
                    <span>{{ $t("Last Result") }}:</span> <span class="keyword">{{ monitor.dns_last_result }}</span>
 | 
			
		||||
                </span>
 | 
			
		||||
            </p>
 | 
			
		||||
 | 
			
		||||
            <div class="functions">
 | 
			
		||||
@@ -161,8 +165,8 @@
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
 | 
			
		||||
            <Confirm ref="confirmPause" @yes="pauseMonitor">
 | 
			
		||||
                Are you sure want to pause?
 | 
			
		||||
            <Confirm ref="confirmPause" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="pauseMonitor">
 | 
			
		||||
                {{ $t("pauseMonitorMsg") }}
 | 
			
		||||
            </Confirm>
 | 
			
		||||
 | 
			
		||||
            <Confirm ref="confirmDelete" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="deleteMonitor">
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user