Louis Lam
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
2023-02-04 18:21:34 +08:00
Joseph
2a6d98ff01
Feat: Expand and Simplify Badge Functionality ( #2211 )
...
* [expanding badges] added new configs
* [expanding badges] recieve ping in getPreviousHeartbeat()
* [expanding badges] re-added original new badges
* [expanding badges] recreate parity between old and new badges
* [expanding badges] fix linting
2023-02-03 12:33:48 +08:00
Louis Lam
683f446cf5
Add support for .env
2023-02-01 20:07:08 +08:00
Nelson Chan
348d0170fa
Chore: Use constants instead of int
2023-02-01 05:33:36 +08:00
Louis Lam
fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge
...
Fix: Add support for pending & maintenance in badges
2023-01-30 15:32:28 +08:00
Louis Lam
ddce8f0cb0
Fix plugin installation
2023-01-28 19:00:13 +08:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08: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
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2023-01-25 00:22:51 +08:00
Louis Lam
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2023-01-25 00:19:54 +08:00
Nelson Chan
c4c720027c
Fix: Use correct log call format
2023-01-24 23:47:33 +08:00
Louis Lam
83e0401dd8
Show game list for GameDig monitor
2023-01-24 23:03:01 +08:00
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
alejandrohernandezrosales
fa23e7ad19
Removed superflous Message prefix
2023-01-20 23:59:11 -06:00
Nelson Chan
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2023-01-18 09:53:04 +08: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
27585d0812
Fix #2618
2023-01-17 01:21:01 +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
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-15 20:14:11 +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
1326761a8a
Update mongodb and simplify the logic of mongodbPing
2023-01-15 01:36:49 +08:00
Louis Lam
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2023-01-15 01:13:11 +08:00
Louis Lam
712a3c29d4
Fix Postgres monitor do not handle some error cases correctly
2023-01-14 21:06:10 +08:00
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2023-01-14 20:16:53 +08:00
long2ice
3b5893ea60
fix: add preserve line in redisPingAsync
2023-01-13 21:30:10 +08:00
long2ice
21cd4d64c3
fix: redisPingAsync
2023-01-13 19:10:07 +08:00
long2ice
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +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
8433bceb32
Trim message to maximum allowed length
2023-01-12 08:14:31 +01:00
Louis Lam
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
...
Add Splunk Notification Provider
2023-01-12 14:15:36 +08:00
Nelson Chan
0ed3dd5e4f
Fix: Add support for pending in badges
2023-01-12 04:14:46 +08:00
Louis Lam
d9f12a6376
Fallback to /bin/ping if ping is not found
2023-01-12 01:05:16 +08:00
Łukasz Szczepański
56ba133a1f
Missing semicolon
2023-01-11 14:36:33 +01: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
Luke
ecd661c801
Allow long sms in PromoSMS
2023-01-11 12:06:09 +01:00
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-11 10:34:24 +01:00
Nelson Chan
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-01-10 19:25:31 +08:00
Joseph Irving
33355c51b7
Add Splunk Notifications
2023-01-09 13:33:10 +00:00
Louis Lam
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
...
Fixed negative retention time values
2023-01-09 13:08:35 +08: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
SlothCroissant
f8658d6160
Removed redundant title in Pushover notification
2023-01-08 10:32:16 -06:00
Nelson Chan
dd82f36da3
Fix: Improve syntax & fix weird label logic
2023-01-09 00:16:18 +08:00
Adam Spurgeon
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
Matthew Nickson
5d6770c0db
Removed excess space around function
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:12:21 +00: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
Louis Lam
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2023-01-06 23:04:02 +08:00
Matthew Nickson
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:19:05 +00:00
long2ice
40ebc2df79
feat: support redis monitor
2023-01-05 23:02:56 +08:00
