Louis Lam
|
35b8e89457
|
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
Added #1059: Allow to specify Resolver Port for DNS Monitor
|
2022-05-25 14:59:14 +08:00 |
|
DasCanard
|
f23baf9c22
|
Added Push Monitor to Discord Notifications
|
2022-05-24 23:14:27 +02:00 |
|
Louis Lam
|
8ede6d888f
|
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
|
2022-05-14 14:37:12 +08:00 |
|
Louis Lam
|
cec0521834
|
[Discord] Fix ping type should no port, update better naming
|
2022-05-14 14:36:40 +08:00 |
|
Louis Lam
|
73b603dd10
|
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
Fixed incorrect uptime calculation for push monitors
|
2022-05-14 14:18:19 +08:00 |
|
Louis Lam
|
66971deaf4
|
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
|
2022-05-11 00:51:42 +08:00 |
|
Louis Lam
|
8077744c60
|
Merge pull request #1604 from c-w/fix-apprise-zulip
Fix apprise integration for Zulip Streams
|
2022-05-11 00:47:50 +08:00 |
|
Jordan Bertasso
|
c5faf709b8
|
Merge branch 'master' into fix-1448-discord-service-url
|
2022-05-10 22:53:55 +10:00 |
|
Karel Krýda
|
7da9f139c1
|
Bug fix
|
2022-05-09 21:10:12 +02:00 |
|
Clemens Wolff
|
b680371746
|
Make apprise notification title configurable in UI
|
2022-05-07 11:00:57 -04:00 |
|
Louis Lam
|
4e3258579d
|
Merge branch 'master' into uptime-badges
# Conflicts:
# server/util-server.js
|
2022-05-07 13:26:47 +08:00 |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
2022-05-06 14:41:34 +08:00 |
|
Clemens Wolff
|
4b9dc2890d
|
Convert let to const
|
2022-05-02 11:16:08 -04:00 |
|
Clemens Wolff
|
f9004bcbed
|
Add optional title to apprise notification
|
2022-05-02 11:14:26 -04:00 |
|
Clemens Wolff
|
bc174c3325
|
Extract child process args into variable
|
2022-05-02 11:00:14 -04:00 |
|
Louis Lam
|
4c2753af46
|
Remove an unused variable
|
2022-05-02 13:36:35 +08:00 |
|
Louis Lam
|
c6ba5b621c
|
Remove isPublished, checkPublished which had been removed in upstream.
|
2022-05-02 13:32:19 +08:00 |
|
Louis Lam
|
d962ab7a1c
|
Merge branch 'master' into uptime-badges
# Conflicts:
# package-lock.json
# server/routers/api-router.js
|
2022-05-01 17:03:11 +08:00 |
|
Louis Lam
|
53b98ad3e4
|
Add more comment for aliyun-sms fix
|
2022-05-01 12:10:47 +08:00 |
|
Louis Lam
|
42ea3fb412
|
Update server/util-server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-30 21:36:07 +08:00 |
|
Louis Lam
|
9f8b3151d8
|
Update server/util-server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-30 21:36:00 +08:00 |
|
GOGOsu
|
73e38a13d2
|
Update server/notification-providers/aliyun-sms.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-04-30 21:08:35 +08:00 |
|
GOGOsu
|
369477b4b9
|
Update aliyun-sms.js
|
2022-04-30 10:45:38 +08:00 |
|
GOGOsu
|
2347a01f7c
|
Update aliyun-sms.js
Add comments for the changed code.
|
2022-04-30 10:42:59 +08:00 |
|
GOGOsu
|
ae2c49a729
|
Update aliyun-sms.js
|
2022-04-30 06:28:16 +08:00 |
|
GOGOsu
|
b9e72b9645
|
Update aliyun-sms.js
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
|
2022-04-30 05:56:10 +08:00 |
|
Louis Lam
|
60538036c6
|
[#1108] Change "true" to "up"
|
2022-04-28 23:44:08 +08:00 |
|
Louis Lam
|
0ba5d031d0
|
Merge branch 'master' into push-status-param
# Conflicts:
# server/routers/api-router.js
|
2022-04-28 23:34:51 +08:00 |
|
Louis Lam
|
023db1450d
|
Fix #1577
|
2022-04-28 23:12:16 +08:00 |
|
Matthew Nickson
|
3c01e8732c
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-27 18:26:11 +01:00 |
|
Louis Lam
|
1687de163c
|
Merge pull request #1565 from Saibamen/eslint
Fix some of ESLint warnings
|
2022-04-27 15:00:49 +08:00 |
|
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
2022-04-26 01:26:57 +02:00 |
|
Adam Stachowicz
|
5fbfacf5ce
|
Fix ESlint warnings
|
2022-04-26 00:26:26 +02:00 |
|
Matthew Nickson
|
d1a3cd047a
|
Merge branch 'master' into #1059-specify-dns-resolver-port
|
2022-04-24 01:06:45 +01:00 |
|
Matthew Nickson
|
587faecf87
|
Made value nullable in apicache JSDoc
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-22 19:42:42 +01:00 |
|
Matthew Nickson
|
46da5e51be
|
Fix JSDoc grammar
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-22 19:10:13 +01:00 |
|
Matthew Nickson
|
1eecdec2d9
|
Update JSDoc for better clarity
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-22 18:42:47 +01:00 |
|
Jens Neuber
|
64a33d7455
|
Update server/util-server.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
2022-04-22 07:54:13 +02:00 |
|
Matthew Nickson
|
09e61d9d63
|
Changed Array<T> to type[]
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 20:02:18 +01:00 |
|
Matthew Nickson
|
9996ba1636
|
Add JSDoc to server/modules/apicache/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 19:55:01 +01:00 |
|
Matthew Nickson
|
c2f6c5b42e
|
Added JSDoc docs for mqttAsync
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 18:53:07 +01:00 |
|
Matthew Nickson
|
0083485d4c
|
Updated server/model/* JSDoc to match new methods
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 18:30:04 +01:00 |
|
Matthew Nickson
|
4ddbf71920
|
Fixed trailing spaces in database.js
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 17:15:39 +01:00 |
|
Matthew Nickson
|
068b920553
|
Add JSDoc to server/socket-handlers/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 17:10:23 +01:00 |
|
Matthew Nickson
|
3d04befc1f
|
Add JSDoc to server/routers/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-21 16:43:24 +01:00 |
|
Matthew Nickson
|
6d22ebedca
|
Merge branch 'master' into add-JSDoc-comments
|
2022-04-21 13:01:22 +01:00 |
|
Matthew Nickson
|
03b2d8d521
|
Add JSDoc to server/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-04-20 19:56:40 +01:00 |
|
Jens Neuber
|
e103ac8335
|
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
|
2022-04-20 10:10:14 +02:00 |
|
Louis Lam
|
10f6a3c4f5
|
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
Add #1209: logout button in navbar
|
2022-04-19 19:59:52 +08:00 |
|
Louis Lam
|
200fdfb808
|
Merge code manually since some code moved to another file
|
2022-04-19 16:46:45 +08:00 |
|