Louis Lam
|
d825dbf828
|
Merge pull request #3188 from chakflying/fix/radius-timeout
Fix: Set radius connection timeout to monitor default
|
2023-07-09 22:47:39 +08:00 |
|
Louis Lam
|
ed6b4e5ae5
|
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
# Conflicts:
# server/database.js
|
2023-07-08 16:19:44 +08:00 |
|
Louis Lam
|
de74efb2e6
|
Merge pull request #3169 from janow25/docker-health-check
Added Docker Health Status Support
|
2023-07-01 02:55:05 +08:00 |
|
Louis Lam
|
4f6035899d
|
Real browser monitor type (#3308)
|
2023-06-27 15:54:33 +08:00 |
|
Tarun Singh
|
7a34103da6
|
Added fix to remove children when type changed
|
2023-06-25 22:44:15 -04:00 |
|
Peace
|
56f448bfe5
|
fix: maintenance heredity
|
2023-05-31 21:29:20 +02:00 |
|
Peace
|
2b46da0f47
|
style: fix linting
|
2023-05-31 21:19:46 +02:00 |
|
Peace
|
9bd76c2795
|
Merge branch 'master' into group-monitors
|
2023-05-31 20:51:33 +02:00 |
|
Louis Lam
|
8ed2b59410
|
Resolve conflict
|
2023-05-26 21:38:51 +08:00 |
|
Louis Lam
|
0b8dddba24
|
Merge remote-tracking branch 'origin/master' into skaempfe#2593
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
|
2023-05-26 21:32:58 +08:00 |
|
Nelson Chan
|
f1a396b0f7
|
Fix: Align radius timeout to default
|
2023-05-23 18:18:54 +08:00 |
|
Janne Nowak
|
f604d96c5b
|
splited if to inner if
|
2023-05-18 09:55:33 +02:00 |
|
Janne Nowak
|
f30f00655f
|
small fix for down containers
|
2023-05-17 23:18:29 +02:00 |
|
Janne Nowak
|
891f09def7
|
removed log
|
2023-05-17 19:15:10 +02:00 |
|
Janne Nowak
|
6b5e179bb0
|
linting
|
2023-05-17 19:02:34 +02:00 |
|
Janne Nowak
|
f653aba735
|
added docker health status
|
2023-05-17 18:52:28 +02:00 |
|
Louis Lam
|
8d24891b8e
|
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
Trim before truncating "keword not found" message
|
2023-05-13 18:36:04 +08:00 |
|
Louis Lam
|
7f5d0e5490
|
Merge remote-tracking branch 'origin/1.21.X'
# Conflicts:
# package-lock.json
|
2023-05-09 00:42:11 +08:00 |
|
Louis Lam
|
f0beccf6bf
|
Fix Same As Server Timezone do not save correctly
|
2023-05-08 22:14:58 +08:00 |
|
Louis Lam
|
d23cb0b382
|
Fix maintenance do not start after 1.21.2
|
2023-05-08 04:08:30 +08:00 |
|
Christopher Wilkinson
|
0e516a42e5
|
Trim before truncating "keword not found" message
|
2023-04-11 16:57:30 +01:00 |
|
Louis Lam
|
9e320dc5fb
|
Expose timezone and local datetime to notification providers
|
2023-04-09 16:01:27 +08:00 |
|
Miles Steele
|
682f8e52a8
|
lint
|
2023-04-06 15:30:38 -05:00 |
|
Miles Steele
|
171aff1226
|
add invert keyword feature
|
2023-04-06 15:25:25 -05:00 |
|
Louis Lam
|
45ef7b2f69
|
Fix Effective Date Range cannot be removed
|
2023-04-03 21:01:58 +08:00 |
|
Louis Lam
|
dbfaddafca
|
Validate cron before submit
|
2023-04-01 16:30:55 +08:00 |
|
Louis Lam
|
524cf7c607
|
WIP
|
2023-03-31 21:34:05 +08:00 |
|
Louis Lam
|
227cec86a8
|
WIP
|
2023-03-31 20:25:37 +08:00 |
|
Louis Lam
|
02291730fe
|
WIP
|
2023-03-31 04:04:17 +08:00 |
|
Louis Lam
|
3c3a192943
|
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
Fix: Check for TLS expiry notified days smaller than target
|
2023-03-26 15:34:26 +08:00 |
|
Louis Lam
|
7330db3563
|
Improve error handling of mysqlQuery and return row count as result
|
2023-03-24 16:08:30 +08:00 |
|
tombii
|
dbe73bd6ae
|
Update monitor.js (#2929)
Language
|
2023-03-15 15:00:28 +08:00 |
|
Louis Lam
|
491239415e
|
Merge remote-tracking branch 'origin/master' into doubles-ss_master
# Conflicts:
# server/database.js
|
2023-03-12 18:38:19 +08:00 |
|
Louis Lam
|
533bc1505b
|
Prevent generating duplicated timeslots
|
2023-03-09 22:03:23 +08:00 |
|
Nelson Chan
|
f32fcb204f
|
Fix: Check for notified days smaller than target
|
2023-03-08 22:26:19 +08:00 |
|
Louis Lam
|
2dedc1cfbd
|
Fix #2776
|
2023-03-07 20:48:11 +08:00 |
|
Louis Lam
|
38ab5e0f3e
|
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
Added #1685: Add API keys for API authentication
|
2023-02-28 16:55:50 +08:00 |
|
Louis Lam
|
ea3b3abe36
|
Fine tune
|
2023-02-25 20:13:46 +08:00 |
|
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
|
f32d3af62c
|
Merge remote-tracking branch 'origin/master' into doubles-ss_master
# Conflicts:
# server/database.js
|
2023-02-25 17:57:25 +08:00 |
|
Louis Lam
|
a7b49fcd98
|
Fix json body after xml body added
|
2023-02-25 17:28:32 +08:00 |
|
Louis Lam
|
ef64077980
|
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
# Conflicts:
# src/lang/en.json
|
2023-02-25 00:06:25 +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
|
2fa233ae7f
|
Fix prometheus null issues
|
2023-02-24 17:12:57 +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 |
|
Peace
|
0be8b111e2
|
chore: better up message
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2023-02-20 13:48:16 +01:00 |
|
Peace
|
cef0a0faf4
|
Merge branch 'master' into group-monitors
|
2023-02-16 21:38:53 +01:00 |
|
Matthew Nickson
|
1d4af39820
|
Fixed JSDoc for one method
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2023-02-15 19:31:22 +00:00 |
|
Luke Hamburg
|
dd1d71530f
|
sorted tags on dashboard
see https://github.com/louislam/uptime-kuma/issues/2785
|
2023-02-15 14:06:29 -05:00 |
|
Matthew Nickson
|
cd796898d0
|
Added expiry check for frontend
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2023-02-14 22:41:06 +00:00 |
|