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
|
2023-02-25 19:14:44 +08:00 |
|
Louis Lam
|
cecb0b6425
|
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
Add xml support to HTTP monitors
|
2023-02-24 17:26:47 +08:00 |
|
Louis Lam
|
4dfc1a0221
|
Merge pull request #2664 from spali/keep_prometheus_instance
remember prometheus instance and expose it
|
2023-02-23 20:43:05 +08:00 |
|
Faruk Genç
|
4287f7e885
|
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
# Conflicts:
# src/lang/en.json
|
2023-02-02 19:43:17 +03:00 |
|
Louis Lam
|
683f446cf5
|
Add support for .env
|
2023-02-01 20:07:08 +08:00 |
|
Faruk Genç
|
35bd129d66
|
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
|
2023-01-28 15:47:42 +03:00 |
|
Louis Lam
|
e5ca67d062
|
HTTPS Monitor using Real Browsers + Limited plugin support (#1787)
|
2023-01-27 18:25:57 +08:00 |
|
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
|
2023-01-25 20:20:11 +03:00 |
|
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
|
2023-01-25 16:12:33 +08:00 |
|
Louis Lam
|
aab04f6644
|
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
|
2023-01-24 19:44:21 +08:00 |
|
Thomas Spalinger
|
f155ec9ba8
|
remember prometheus instance and expose it
in preperation for #2491,#680 and #898
|
2023-01-24 10:32:49 +00:00 |
|
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
|
2023-01-14 16:40:13 +03:00 |
|
Nelson Chan
|
e9564619f1
|
Feat: Implement tags manager in settings
Fix: Remove unused color options
Chore: Fix typo
|
2023-01-12 21:25:33 +08:00 |
|
Adam Spurgeon
|
774d754b21
|
Add GameDig monitor
|
2023-01-08 21:43:30 +13:00 |
|
Matthew Nickson
|
7a13b959a3
|
Updated to match changes in #2223
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2023-01-06 20:09:40 +00:00 |
|
minhhoang
|
4147a4c404
|
fix: #2480
|
2022-12-28 22:31:33 +07:00 |
|
Louis Lam
|
765d8e1297
|
Fix #2318
|
2022-12-15 13:39:48 +08:00 |
|
Louis Lam
|
39987ba9ac
|
Init server timezone
|
2022-12-12 22:57:57 +08:00 |
|
Louis Lam
|
3b87209e26
|
Add configurable dns cache
|
2022-12-12 17:19:22 +08:00 |
|
Louis Lam
|
4cd5b5563f
|
Fix #1145
|
2022-12-08 23:21:55 +08:00 |
|
Louis Lam
|
e478084ff9
|
Fix Uptime Kuma cannot be stopped
|
2022-12-08 19:13:47 +08:00 |
|
Louis Lam
|
ee1a56caae
|
Update /test-webhook and reevaluate sensitive fields
|
2022-12-05 18:18:19 +08:00 |
|
minhhn3
|
b459408b10
|
fix: resolve conflict
|
2022-10-26 20:41:21 +07:00 |
|
Matthew Nickson
|
4339ca7eb5
|
Merge branch 'master' into feature/#1891-set-ping-packet-size
|
2022-10-22 16:22:28 +01:00 |
|
Louis Lam
|
0b8d4cdaac
|
Generate Next Timeslot for recurring interval
|
2022-10-15 17:17:26 +08:00 |
|
Louis Lam
|
268cbdbf8d
|
Merge remote-tracking branch 'origin/master' into maintenance
# Conflicts:
# server/server.js
# src/components/settings/General.vue
|
2022-10-15 15:57:39 +08:00 |
|
Louis Lam
|
2faf866e9e
|
Implement generateTimeslot() for recurring interval type
|
2022-10-12 17:02:16 +08:00 |
|
Louis Lam
|
7b9766091e
|
Revert testing
|
2022-10-11 22:18:09 +08:00 |
|
Louis Lam
|
a36f24d827
|
Add configurable server timezone
|
2022-10-09 20:59:58 +08:00 |
|
Louis Lam
|
ad1a7c255f
|
Drop exports.entryPage fully
|
2022-10-08 23:56:58 +08:00 |
|
George Tsomlektsis
|
3e699f8ac3
|
Fix linting errors.
|
2022-10-03 18:01:52 +03:00 |
|
George Tsomlektsis
|
b0d6b5b13d
|
Fixed entry route not redirecting correctly when the status entry page changes slug.
|
2022-10-03 17:48:34 +03:00 |
|
Louis Lam
|
b1465c0282
|
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
|
2022-09-28 00:20:17 +08:00 |
|
Justin Tisdale
|
0814d643c1
|
Merge branch 'master' into feature/expand-http-payload-support
|
2022-09-25 10:45:32 -04:00 |
|
Louis Lam
|
120e578398
|
Move maintenance code to maintenance-socket-handler.js
|
2022-09-17 16:58:08 +08:00 |
|
Louis Lam
|
7017c2e625
|
Move maintenance code to maintenance-socket-handler.js
|
2022-09-17 16:54:21 +08:00 |
|
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
|
2022-09-17 16:12:57 +08:00 |
|
Matthew Nickson
|
742b1337be
|
Merge branch 'master' into feature/#1891-set-ping-packet-size
|
2022-09-10 21:20:03 +01:00 |
|
Louis Lam
|
197d44981f
|
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
# package.json
|
2022-09-09 16:32:23 +08:00 |
|
minhhn3
|
3a90d246a4
|
fix: wrong type
|
2022-08-20 22:45:11 +07:00 |
|
Justin Tisdale
|
6ec6410808
|
Merge branch 'master' into feature/expand-http-payload-support
|
2022-08-20 10:24:18 -04:00 |
|
Matthew Nickson
|
c3d655afb4
|
Merge branch 'master' into feature/#1891-set-ping-packet-size
|
2022-08-13 21:15:16 +02:00 |
|
minhhn3
|
6bb79597e8
|
fix: resolve merge conflict
|
2022-08-13 13:26:05 +07:00 |
|
Louis Lam
|
de6e1e7ddd
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# server/database.js
|
2022-08-13 13:24:00 +08:00 |
|
Justin Tisdale
|
0d58526f25
|
Merge branch 'master' into feature/expand-http-payload-support
|
2022-08-11 21:04:11 -04:00 |
|
Justin Tisdale
|
2b9bf095a6
|
Add non-json support for http body
|
2022-08-11 20:57:03 -04:00 |
|
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
|
2022-08-11 21:08:06 +08:00 |
|
Louis Lam
|
d0d1e0de28
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# src/pages/EditMonitor.vue
|
2022-08-05 15:40:06 +08:00 |
|
Minh Hoàng
|
dcecd10c88
|
Feat/add gRPC protocol (#1)
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
|
2022-08-03 12:00:39 +07:00 |
|
Louis Lam
|
70aa8fe453
|
Merge pull request #1183 from c0derMo/master
Adding option to monitor other docker containers
|
2022-08-02 19:08:46 +08:00 |
|