Louis Lam
|
7f9332c753
|
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
|
2 years ago |
|
Louis Lam
|
cecb0b6425
|
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
Add xml support to HTTP monitors
|
2 years ago |
|
Louis Lam
|
4dfc1a0221
|
Merge pull request #2664 from spali/keep_prometheus_instance
remember prometheus instance and expose it
|
2 years ago |
Faruk Genç
|
4287f7e885
|
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
# src/lang/en.json
|
2 years ago |
|
Louis Lam
|
683f446cf5
|
Add support for `.env`
|
2 years ago |
|
Faruk Genç
|
35bd129d66
|
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
|
2 years ago |
|
Louis Lam
|
e5ca67d062
|
HTTPS Monitor using Real Browsers + Limited plugin support (#1787)
|
2 years ago |
|
Faruk Genç
|
9329ec9234
|
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
# server/database.js
# server/model/monitor.js
|
2 years ago |
|
Louis Lam
|
5050ebc249
|
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
# Conflicts:
# server/util-server.js
# src/languages/en.js
|
2 years ago |
|
Louis Lam
|
aab04f6644
|
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
|
2 years ago |
Thomas Spalinger
|
f155ec9ba8
|
remember prometheus instance and expose it
in preperation for #2491,#680 and #898
|
2 years ago |
|
Faruk Genç
|
be850dd596
|
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
|
2 years ago |
Nelson Chan
|
e9564619f1
|
Feat: Implement tags manager in settings
Fix: Remove unused color options
Chore: Fix typo
|
2 years ago |
Adam Spurgeon
|
774d754b21
|
Add GameDig monitor
|
2 years ago |
Matthew Nickson
|
7a13b959a3
|
Updated to match changes in #2223
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2 years ago |
minhhoang
|
4147a4c404
|
fix: #2480
|
2 years ago |
|
Louis Lam
|
765d8e1297
|
Fix #2318
|
2 years ago |
|
Louis Lam
|
39987ba9ac
|
Init server timezone
|
2 years ago |
|
Louis Lam
|
3b87209e26
|
Add configurable dns cache
|
2 years ago |
|
Louis Lam
|
4cd5b5563f
|
Fix #1145
|
2 years ago |
|
Louis Lam
|
e478084ff9
|
Fix Uptime Kuma cannot be stopped
|
2 years ago |
|
Louis Lam
|
ee1a56caae
|
Update /test-webhook and reevaluate sensitive fields
|
2 years ago |
|
minhhn3
|
b459408b10
|
fix: resolve conflict
|
2 years ago |
|
Matthew Nickson
|
4339ca7eb5
|
Merge branch 'master' into feature/#1891-set-ping-packet-size
|
2 years ago |
|
Louis Lam
|
0b8d4cdaac
|
Generate Next Timeslot for recurring interval
|
2 years ago |
|
Louis Lam
|
268cbdbf8d
|
Merge remote-tracking branch 'origin/master' into maintenance
# Conflicts:
# server/server.js
# src/components/settings/General.vue
|
2 years ago |
|
Louis Lam
|
2faf866e9e
|
Implement generateTimeslot() for recurring interval type
|
2 years ago |
|
Louis Lam
|
7b9766091e
|
Revert testing
|
2 years ago |
|
Louis Lam
|
a36f24d827
|
Add configurable server timezone
|
2 years ago |
|
Louis Lam
|
ad1a7c255f
|
Drop exports.entryPage fully
|
2 years ago |
George Tsomlektsis
|
3e699f8ac3
|
Fix linting errors.
|
2 years ago |
|
George Tsomlektsis
|
b0d6b5b13d
|
Fixed entry route not redirecting correctly when the status entry page changes slug.
|
2 years ago |
|
Louis Lam
|
b1465c0282
|
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
|
2 years ago |
Justin Tisdale
|
0814d643c1
|
Merge branch 'master' into feature/expand-http-payload-support
|
2 years ago |
|
Louis Lam
|
120e578398
|
Move maintenance code to `maintenance-socket-handler.js`
|
2 years ago |
|
Louis Lam
|
7017c2e625
|
Move maintenance code to `maintenance-socket-handler.js`
|
2 years ago |
|
Louis Lam
|
90761cf831
|
Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
|
2 years ago |
|
Matthew Nickson
|
742b1337be
|
Merge branch 'master' into feature/#1891-set-ping-packet-size
|
2 years ago |
|
Louis Lam
|
197d44981f
|
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
# package.json
|
2 years ago |
|
minhhn3
|
3a90d246a4
|
fix: wrong type
|
2 years ago |
|
Justin Tisdale
|
6ec6410808
|
Merge branch 'master' into feature/expand-http-payload-support
|
2 years ago |
|
Matthew Nickson
|
c3d655afb4
|
Merge branch 'master' into feature/#1891-set-ping-packet-size
|
2 years ago |
|
minhhn3
|
6bb79597e8
|
fix: resolve merge conflict
|
2 years ago |
|
Louis Lam
|
de6e1e7ddd
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# server/database.js
|
2 years ago |
|
Justin Tisdale
|
0d58526f25
|
Merge branch 'master' into feature/expand-http-payload-support
|
2 years ago |
|
Justin Tisdale
|
2b9bf095a6
|
Add non-json support for http body
|
2 years ago |
|
Louis Lam
|
3b3763351b
|
Merge remote-tracking branch 'origin/master' into radius-check
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
|
2 years ago |
|
Louis Lam
|
d0d1e0de28
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# src/pages/EditMonitor.vue
|
2 years ago |
Minh Hoàng
|
dcecd10c88
|
Feat/add gRPC protocol (#1)
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
|
2 years ago |
|
Louis Lam
|
70aa8fe453
|
Merge pull request #1183 from c0derMo/master
Adding option to monitor other docker containers
|
2 years ago |
