Nelson Chan
2c0180f323
Fix: Fix error when status page desc. is null
3 years ago
Louis Lam
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
3 years ago
Louis Lam
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
3 years ago
Louis Lam
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
3 years ago
Louis Lam
091158cfe7
[Status Page] Preload data
3 years ago
Louis Lam
e4ad8cbfc8
Remove unused variables
3 years ago
Louis Lam
a674caa520
[Status Page] Add og meta tags
3 years ago
Louis Lam
c095767f4a
[Status Page] SSR
3 years ago
Louis Lam
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
3 years ago
Aram Akhavan
ea10d89f51
show correct down message for first tick
3 years ago
Louis Lam
7f46223d68
Fix another log.debug call
3 years ago
Louis Lam
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
Moritz R
e9e78c26e5
Merge branch 'master' into master
3 years ago
Aram Akhavan
ab4edf2092
Fix log.debug calls
3 years ago
Marc Hagen
5830f1e0b5
[feat] Adding PagerDuty notification
3 years ago
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
DasCanard
f23baf9c22
Added Push Monitor to Discord Notifications
3 years ago
Philipp Dormann
54184350a4
fix: missing semicolons
3 years ago
Philipp Dormann
14dbe7c334
clean up + default ntfs.sh server url
3 years ago
Philipp Dormann
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
3 years ago
c0derMo
32cfd411f8
Fixed style & code errors
3 years ago
Moritz R
a9f3142cee
Merge branch 'master' into master
3 years ago
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
3 years ago
Sascha Kruse
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
3 years ago
Sascha Kruse
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
Louis Lam
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
Louis Lam
cec0521834
[Discord] Fix ping type should no port, update better naming
3 years ago
Louis Lam
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
3 years ago
Christopher Pickering
ef73af391f
added option for ntlm authorization
3 years ago
Christopher Pickering
44f6fca945
added finally to close connection pool
3 years ago
Christopher Pickering
c346ea7864
updated name on export
3 years ago
Christopher Pickering
f0ad32a252
merged
3 years ago
Christopher Pickering
5720017fb4
updated name on import
3 years ago
sur.la.route
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
sur.la.route
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Christopher Pickering
87f933df4f
added sqlserver monitor
3 years ago
Sascha Kruse
398ecb7666
add radius check
3 years ago
Louis Lam
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
Louis Lam
59be9bb971
working
3 years ago
Louis Lam
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
3 years ago
Jordan Bertasso
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
Karel Krýda
7da9f139c1
Bug fix
3 years ago
Clemens Wolff
b680371746
Make apprise notification title configurable in UI
3 years ago
Louis Lam
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
Aram Akhavan
cd3fbc80b4
Add first parameter back to logging in api router
3 years ago
Aram Akhavan
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
OidaTiftla
93050208bb
Merge database changes into single patch file
3 years ago
OidaTiftla
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
Greg Smith
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
Clemens Wolff
4b9dc2890d
Convert let to const
3 years ago
Clemens Wolff
f9004bcbed
Add optional title to apprise notification
3 years ago
Clemens Wolff
bc174c3325
Extract child process args into variable
3 years ago
Louis Lam
4c2753af46
Remove an unused variable
3 years ago
Louis Lam
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
3 years ago
Louis Lam
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
Louis Lam
53b98ad3e4
Add more comment for aliyun-sms fix
3 years ago
Greg Smith
d0546afe71
fix esm require: no ugly warnings
3 years ago
Louis Lam
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
GOGOsu
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
GOGOsu
369477b4b9
Update aliyun-sms.js
3 years ago
GOGOsu
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
3 years ago
GOGOsu
ae2c49a729
Update aliyun-sms.js
3 years ago
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码字符进行编码。
3 years ago
Louis Lam
60538036c6
[ #1108 ] Change "true" to "up"
3 years ago
Louis Lam
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
3 years ago
Louis Lam
023db1450d
Fix #1577
3 years ago
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
Aram Akhavan
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
3 years ago
Adam Stachowicz
1e595eaa76
Update linters
3 years ago
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
3 years ago
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Matthew Nickson
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jens Neuber
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
OidaTiftla
7ed8ae9f7c
Fix trailing space warning
3 years ago
Matthew Nickson
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
OidaTiftla
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
OidaTiftla
19933bbd99
Improve backwards compatibility
3 years ago
OidaTiftla
60f8ab7285
Use new logging mechanism
3 years ago
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jens Neuber
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Louis Lam
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
3 years ago
Louis Lam
200fdfb808
Merge code manually since some code moved to another file
3 years ago
Louis Lam
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
Louis Lam
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
Louis Lam
17d4003e5c
Add dropdown menu
3 years ago
Louis Lam
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
3 years ago
Louis Lam
addf75daa7
Fix MQTT password do not save
3 years ago
Louis Lam
359a490ae3
Fix #1510
3 years ago
Nelson Chan
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
e6a8a84278
Include only nessacary data in webhook
3 years ago
Louis Lam
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
Matthew Nickson
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
07c474db0b
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
Louis Lam
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
Matthew Nickson
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
566133e350
Domain Name Expiry Notification for https monitor only
3 years ago
Louis Lam
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
Louis Lam
083e8355b7
Change debug to log.debug
3 years ago
Louis Lam
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
3 years ago
Matthew Nickson
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jordan Bertasso
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
Louis Lam
fb0064082e
Change Pushdeer to PushDeer
3 years ago
ngc7331
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
ngc7331
fb059f5e91
Add support for Pushdeer notifications
3 years ago
Louis Lam
d0b5f147e2
Fix spelling and merge mistake
3 years ago
Louis Lam
ddf8a7a692
Fix camelCase
3 years ago
ColdThunder11
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
ColdThunder11
4656ab3d57
Add OneBot notification service
3 years ago
Louis Lam
0a5db0cecb
Fix #1478
3 years ago
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Matthew Nickson
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
3 years ago
Louis Lam
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
3 years ago
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
Louis Lam
4053b9db1f
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
3 years ago
Louis Lam
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
3 years ago
Louis Lam
94770cf865
Resolve log message null reference
3 years ago
Louis Lam
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
3 years ago
jordanbertasso
2638d68c97
Cover dns and steam types in Discord notifs
3 years ago
jordanbertasso
0961c6d9b3
Check for ping and port type in discord notifs
3 years ago
Louis Lam
c9fa183712
Manage domain names
3 years ago
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
3 years ago
Louis Lam
6a30dbd71a
Fix Mattermost when channel is empty #1468
3 years ago
Louis Lam
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320
)
3 years ago
Louis Lam
008dc27f52
Reload proxy settings for monitors in the monitorList
3 years ago
Louis Lam
5027fcd320
Export server using an object class
3 years ago
Louis Lam
d5e68f8453
Export monitor list
3 years ago