github
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma
1
0
Fork 0
Code Issues Releases Wiki Activity
3,773 Commits
33 Branches
117 Tags
73 MiB
Commit Graph

518 Commits (42a69c16ca42de0b34688b95e1f2e0188ad2811b)

Author SHA1 Message Date
Matthew Nickson d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key 2023-02-14 19:53:33 +00:00
Matthew Nickson 0d6a8b2101
Added more options for confirm modal 
The ability to set the title of the modal has been added, as well as
custom callbacks for the no option.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 18:23:51 +00:00
Louis Lam ddce8f0cb0 Fix plugin installation 2023-01-28 19:00:13 +08:00
Louis Lam 50573e6c89
Merge pull request #2635 from Computroniks/bug/2628-uptime-over-100 
Perform sanity check on uptime for status page
 2023-01-27 18:33:37 +08:00
Louis Lam e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787) 2023-01-27 18:25:57 +08:00
Cyril59310 ae0ef79060
Update french translation (#2634) 2023-01-24 15:16:18 +08:00
Matthew Nickson e9044ae956
Removed repetitiion of % 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-23 18:10:45 +00:00
Matthew Nickson 86bcb85e9b
Perform sanity check on uptime for status page 
Fixes #2628
A sanity check is performed when calculating the uptime of a monitor on
status page. If it is greater than 100%, we just show 100%. This hasn't
been implemented on the dashboard at the request of @louislam due to
concerns it would make debugging more difficult in future if changes
were made to the uptime calculation.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-18 16:38:55 +00:00
Louis Lam c47b6c5995 Merge remote-tracking branch 'origin/1.19.X' 
# Conflicts:
#	package-lock.json
#	package.json
#	src/util-frontend.js
 2023-01-17 21:17:04 +08:00
Louis Lam a5ff27da7a Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead 2023-01-17 17:34:47 +08:00
Louis Lam e675316635
Merge pull request #2586 from PopcornPanda/fix-2544 
Fix: Allow long sms in PromoSMS
 2023-01-16 13:21:56 +08:00
Louis Lam 49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05 
Added missing JSDoc comments
 2023-01-15 13:10:17 +08:00
Louis Lam f7d41a30fa
Update src/components/TagEditDialog.vue 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-13 23:15:41 +08:00
Nelson Chan 9c1ba97e7d Chore: Fix typo 2023-01-12 21:25:33 +08: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
Łukasz Szczepański ec30147a7f Add option for allowing long sms in PromoSMS 2023-01-11 14:32:57 +01:00
Luke 2172112144
Setting for allowing long sms 2023-01-11 12:13:47 +01:00
Joseph Irving 33355c51b7 Add Splunk Notifications 2023-01-09 13:33:10 +00:00
Matthew Nickson 32f7a0084a
Fixed negative retention time values 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-08 19:09:06 +00:00
Matthew Nickson dc8289df12
Added JSDoc for src/ 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-05 22:55:51 +00:00
Nelson Chan edd8fe2e22 Fix: Fix incorrect tag form validation 2023-01-03 22:18:45 +08:00
Louis Lam cd7a6e4019
Merge pull request #2478 from YehowahLiu/master 
Add Kook notification provider
 2023-01-01 02:53:03 +08:00
Louis Lam 5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider) 
Zoho Cliq Notification Provider
 2022-12-29 19:00:50 +08:00
Louis Lam 9fe9e235ca
Merge pull request #2236 from mishankov/fix/stats-30-days 
Simple fix for Uptime component
 2022-12-28 15:37:46 +08:00
401Unauthorized 50b84f5f45
fix code style: add missing semicolon 2022-12-27 14:12:22 +08:00
401Unauthorized c60b741406
Add kook notification provider 2022-12-27 14:12:22 +08:00
Cyril59310 4862bec965
Update Fr language + added variable for missing translation (#2395) 
* Update FR language
 2022-12-13 22:00:54 +08:00
Louis Lam aa784fb3b2 Fix #2394 2022-12-13 16:48:23 +08:00
Louis Lam 3b87209e26 Add configurable dns cache 2022-12-12 17:19:22 +08:00
Louis Lam ab5f6dc82c Fix css 2022-12-11 18:52:24 +08:00
panos 73bfdb9ef9 zoho cliq notification provider 2022-12-08 13:32:10 +02:00
Louis Lam 8aa97635ec Improve the clear filter button 2022-12-05 18:21:16 +08:00
Louis Lam 5196abfd36 Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919 2022-12-05 17:52:02 +08:00
Joshua Brunner cd270bd8b5 Add socks5h support 
Add socks5h support as an extra option to not break previous socks5 implementation.
Allows to toggle between socks5 and socks5h explicit.

Fixes #2296
 2022-11-22 11:18:16 +01:00
Jan Hartje 258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919 2022-11-14 20:17:36 +01:00
Louis Lam fd15e7c2dc Merge remote-tracking branch 'origin/master' into ntfy-icon 
# Conflicts:
#	server/notification-providers/ntfy.js
#	src/components/notifications/Ntfy.vue
#	src/languages/en.js
 2022-10-31 17:10:20 +08:00
Louis Lam 5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle 
Added support for SMSEagle device API notifications
 2022-10-31 17:03:34 +08:00
Adam Stachowicz 134b3b8ac1 Fix 'dayjs' is never used warning 2022-10-25 01:27:25 +02:00
Marcin Kiszka 08763b700a Added support for SMSEagle device API notifications 2022-10-24 12:45:56 +02:00
Denis Mishankov 7313aa6563 fix spaces 2022-10-17 20:36:52 +03:00
Denis Mishankov c7871427c3 compute title value 2022-10-17 20:20:51 +03: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 c662d259b0
Firefox Better Support #2206 2022-10-13 19:28:02 +08:00
Louis Lam edacff123b Add UTC in the serverTimezone dropdown 2022-10-12 22:13:07 +08:00
Louis Lam 2faf866e9e Implement generateTimeslot() for recurring interval type 2022-10-12 17:02:16 +08:00
Louis Lam dfb75c8afb Update status page's maintenance message 2022-10-11 20:56:48 +08:00
Christian Meis 1e8a16504b Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined. 2022-10-11 11:15:33 +02:00
Louis Lam a36f24d827 Add configurable server timezone 2022-10-09 20:59:58 +08:00
Louis Lam b007681e67 Merge remote-tracking branch 'origin/master' into karelkryda_master 
# Conflicts:
#	server/model/monitor.js
#	server/model/status_page.js
#	src/languages/en.js
 2022-10-09 19:26:00 +08:00
AnnAngela 43c1ec640c
feat: 🌐 Update zh-cn and en translation (#2167) 
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2022-10-08 01:45:00 +08:00