Jens Neuber
f00ec4dfef
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-01-05 15:26:29 +01:00
Jens Neuber
43f8fc701c
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-01-05 15:26:23 +01:00
Jens Neuber
499042504f
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-01-05 15:26:07 +01:00
Jens Neuber
faf6719e7c
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-01-05 15:25:56 +01:00
Jens Neuber
a9d264ccfc
PR feedback: remove spaces in comments
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-01-05 15:25:42 +01:00
Jens Neuber
df8f93f0c2
clean uptime percentage display
2022-01-05 11:48:25 +01:00
Jens Neuber
28c0e16a0c
PR feedback
2022-01-04 16:01:40 +01:00
Jens Neuber
6acc9546a0
PR feedback + remove redundant code + add a test
2022-01-04 16:00:21 +01:00
Jens Neuber
f455e3a454
add shields.io 'style' parameter
2022-01-04 13:43:13 +01:00
Jens Neuber
7abbf421d0
PR feedback
2022-01-04 12:23:16 +01:00
Jens Neuber
3625915a85
add ping, status badge
2022-01-04 12:21:53 +01:00
Jens Neuber
d74404e106
minor fixes
2022-01-03 16:23:23 +01:00
Jens Neuber
1c5bce8afa
a little documentation
2022-01-03 16:04:37 +01:00
Jens Neuber
35360e2069
add badges
2022-01-03 15:48:52 +01:00
Leslie Leung
590859a95b
Merge branch 'master' into add-wecom-notification
2022-01-03 21:43:56 +08:00
Louis Lam
e18d4b6ad0
Merge pull request #1045 from bilipp/google-chat-notifications
...
Add support for Google Chat Notifications
2021-12-30 00:16:34 +08:00
Louis Lam
72a59ce7a4
add status page table
2021-12-27 18:54:48 +08:00
LeslieLeung
40b70277c7
feat(*): support WeCom notification
2021-12-26 13:11:42 +08:00
Jakub Blažej
3d002b3ce9
add status boolean parameter to push monitor
2021-12-25 20:25:21 +01:00
Tarun Singh
4118de6d53
fix protocol not defined bug
2021-12-23 19:39:47 -05:00
Nelson Chan
624cd862a5
Feat: Expose SMTP DKIM settings
2021-12-19 13:30:53 +08:00
Tarun Singh
d3c90df8a8
fixed edit monitor fields empty issues
2021-12-18 16:35:18 -05:00
Louis Lam
a42932a43e
Simulate Chrome's request Accept header. Better handling of #1067
2021-12-16 15:09:10 +08:00
Philipp Bischoff
a6072a0e30
google chat: only show offline message in notification when service went down
2021-12-15 13:40:21 +01:00
Philipp Bischoff
a71569379e
add missing import
2021-12-12 00:01:12 +01:00
Philipp Bischoff
8050cb8e99
implement google chat notification type
2021-12-11 23:43:12 +01:00
Andreas Brett
38f8a8ac2f
Merge branch 'louislam:master' into logging
2021-12-10 17:21:55 +01:00
Louis Lam
d4bfe57b79
minor: improve formatting
2021-12-08 15:04:18 +08:00
Louis Lam
dcc91d6c72
Fix #922
2021-12-08 14:59:59 +08:00
Andreas Brett
e684712a77
Merge branch 'louislam:master' into logging
2021-12-07 18:21:56 +01:00
Jonas Liebert
67849a9e84
add support for stackfield notifications
2021-12-02 08:53:45 +01:00
Andreas Brett
a13bdaac84
Merge branch 'master' into logging
2021-11-29 20:32:42 +01:00
Louis Lam
40cb22e671
Merge pull request #963 from kffl/feat/serwersms-provider
...
Add SerwerSMS.pl notification provider
2021-11-29 20:43:38 +08:00
Louis Lam
a864b72e03
fix pushover for general message
2021-11-29 17:19:55 +08:00
kffl
186c11540f
style(serwersms): add missing trailing commas
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-27 13:16:17 +01:00
Paweł Kuffel
c1267e9b3b
feat: add SerwerSMS notification provider
2021-11-25 18:24:36 +01:00
Louis Lam
37e6ca8d77
Merge pull request #950 from dingdayu/master
...
Update dingding notification title
2021-11-24 11:36:00 +08:00
Fluency
e3745da986
Merge branch 'master' into master
2021-11-23 10:26:45 -08:00
Louis Lam
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
2021-11-23 22:48:54 +08:00
小雨
dce908a07b
Update dingding notification title
...
Add the status to the title, you can see the message title on the friend list page.
2021-11-23 20:36:22 +08:00
Louis Lam
3d222ac5f5
fix btoa is not define
2021-11-23 12:59:48 +08:00
Louis Lam
c811c1ccde
Merge pull request #753 from chakflying/settings-redesign
...
UI: Redesign/organize settings page
2021-11-23 12:46:59 +08:00
Tarun Singh
35da8c78f4
added connection timeout and refactored code
2021-11-22 03:21:53 -05:00
Andreas Brett
ed96757b24
Merge branch 'louislam:master' into logging
2021-11-19 08:56:25 +01:00
Tarun Singh
3306f4a8e0
removed extra logging
2021-11-18 14:03:23 -05:00
Louis Lam
5d3bf68123
add remove-2fa command
2021-11-18 18:22:03 +08:00
Nelson Chan
7f4d5a0f76
Test: fix tests
...
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Investigate error message
Test: Attempt to fix tests
Chore: Cleanup code
Test: Attempt to fix tests
Test: Attempt to fix tests
2021-11-17 10:45:24 +08:00
Nelson Chan
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
2021-11-17 10:45:19 +08:00
Tarun Singh
3f5133d1ba
Added authentication logic
2021-11-16 20:44:10 -05:00
Andreas Brett
e5913c5abc
separate log functions
2021-11-15 17:52:28 +01:00
Andreas Brett
bdcdf47e52
introduce consistent logging
2021-11-11 12:31:28 +01:00
Calum Bird
f55350bebc
Generated documentation :)
2021-11-09 21:24:31 -08:00
Louis Lam
0275d7a42b
minor
2021-11-08 15:51:32 +08:00
Louis Lam
41a6d1b701
Fix parseCertificateInfo possibly in dead loop
2021-11-08 15:39:17 +08:00
Ivan Bratović
34d8984e3a
Merge branch 'master' into http-basicauth
2021-11-07 17:15:36 +01:00
Louis Lam
c92153c97e
add more debug msg
2021-11-07 21:00:47 +08:00
Jasper Miller-Waugh
e4506963d9
Merge branch 'louislam:master' into tags-on-status
2021-11-07 14:39:43 +13:00
Tarun Singh
d5d07da4ee
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-04 22:22:53 -04:00
Tarun Singh
2d802585ff
Update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-04 22:21:54 -04:00
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
Ivan Bratović
0dcb7aed21
Delinting
2021-11-04 09:50:10 +01:00
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
2021-11-04 09:50:10 +01:00
Ivan Bratović
665c263c03
Add db migrations for new basic auth fields
2021-11-04 09:50:10 +01:00
Tarun Singh
6828e8ef6d
Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma
2021-11-03 21:47:44 -04:00
Tarun Singh
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
Louis Lam
82cde7c847
Merge pull request #854 from 634750802/patch-1
...
Add a status prefix for feishu notification's title
2021-11-03 16:36:21 +08:00
Jasper Miller-Waugh
e5d6410caf
Apply formatting suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-03 11:46:53 +13:00
Louis Lam
c094dc0c5b
speed up redirect by using 302 redirect instead of vue redirect
2021-11-02 21:48:46 +08:00
Jagger
f3651a1219
Add a status prefix for feishu notification
2021-11-01 13:31:31 +08:00
Jasper Miller-Waugh
12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.
...
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
2021-11-01 13:23:46 +13:00
Louis Lam
e7104737e7
prevent to show "New Update" when the Docker image is not ready yet
2021-10-31 00:36:46 +08:00
Jasper Miller-Waugh
74688e69aa
Remove debug statement in server/routers/api-router.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh
b32bfb3ff1
Added toggle for tag visibility
2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh
348c5ec995
Match lint settings
2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh
5e6d945095
Most hacked in POC
2021-10-30 21:16:10 +13:00
Louis
ba93129b18
Merge branch '1.9.X'
...
# Conflicts:
# server/server.js
2021-10-30 10:05:08 +08:00
Louis
caa2a34177
fix 2fa not working #833
2021-10-30 02:35:05 +08:00
Louis
d4c9431142
catch createWriteStream error
2021-10-29 18:28:31 +08:00
Louis
d7f7dba13f
write some error logs to ./data/error.log
2021-10-29 18:24:47 +08:00
Louis Lam
e261a27ebe
fix wrong call of rejectUnauthorized for smtp ( #757 )
2021-10-28 11:10:09 +08:00
Louis Lam
eb22ad5ffe
[certificate notification] error handling and better msg
2021-10-27 16:12:18 +08:00
Louis Lam
f5f4835b74
[certificate notification] clear sent history if the cert is changed
2021-10-27 16:03:16 +08:00
Louis Lam
44c1b336dc
send certificate notifications in 21, 14, 7 days
2021-10-27 15:33:15 +08:00
Louis Lam
110ec491ee
Merge branch 'master' into cert-notification
2021-10-27 14:16:37 +08:00
Louis Lam
640b6e5b1c
prevent monitor dead for unexpected error
2021-10-27 14:08:44 +08:00
Louis Lam
698a38e773
clear status page cache in a better place
2021-10-27 11:39:46 +08:00
Louis Lam
a9e319517a
add auto vacuum and shrink database button
2021-10-26 23:02:32 +08:00
Louis Lam
77addfebc8
Merge branch 'tarun7singh_master'
...
# Conflicts:
# src/languages/vi.js
2021-10-26 16:26:59 +08:00
Louis Lam
d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification
...
Support for Bark (APN) notifications
2021-10-26 16:23:11 +08:00
Tarun Singh
ba1e025353
added click send to number
2021-10-25 04:11:57 -04:00
Tarun Singh
fed611d1b9
Merge branch 'master' of https://github.com/louislam/uptime-kuma
2021-10-24 15:19:25 -04:00
Tarun Singh
bc68088350
Click send sms integration for notifications
2021-10-24 15:17:29 -04:00
Nelson Chan
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
2021-10-24 01:44:55 +08:00
Nelson Chan
b83c59e308
WIP: Add options for chart period
...
Fix: Fix callback, add toast on error
Fix: Improve styling
Fix: Restore default chart behavior
Fix: Replace 1h with 3h
draft only
2021-10-24 01:44:08 +08:00
Lakr Aream
ce852dfa02
Support for Bark (APN) notifications
...
Update bark.js
2021-10-24 00:31:43 +08:00
Louis Lam
957c292307
add certificate-notification job
2021-10-23 21:44:21 +08:00
Louis Lam
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
2021-10-23 17:00:46 +08:00
Louis Lam
b77b33e790
add login rate limiter
2021-10-23 16:35:13 +08:00
Louis Lam
56094a43d7
add passwordStrength
2021-10-21 22:54:04 +08:00
Louis Lam
cd04ac4557
"dist/index.html" is no longer needed for development environment
2021-10-20 01:32:19 +08:00
Louis Lam
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
...
Text update
2021-10-19 16:34:00 +08:00
Louis Lam
6c1ee70e15
fix
2021-10-19 16:29:09 +08:00
Louis Lam
5c3892313e
add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN
2021-10-19 14:41:05 +08:00
Louis Lam
c57c94642c
Merge remote-tracking branch 'origin/master'
2021-10-19 14:26:26 +08:00
Louis Lam
62f168a2a5
config response header
2021-10-19 14:26:10 +08:00
Andreas Brett
acc2995d86
invalidate used token
2021-10-19 00:42:33 +02:00
NeuralMiner
9ddffc0f7f
Updates
2021-10-18 14:35:47 -06:00
NeuralMiner
76e7c8b276
Rebase
2021-10-18 14:35:36 -06:00
NeuralMiner
572a5300aa
Recommended updates.
2021-10-18 13:25:53 -06:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges
2021-10-18 12:57:28 -06:00
Louis Lam
23714ab688
genSecret don't need await
2021-10-18 17:37:11 +08:00
Louis Lam
6e18f39eb4
[steam] code cleanup
2021-10-18 17:15:28 +08:00
Louis Lam
68d44dd9b3
[steam] do not request if there is no steam api key
2021-10-18 17:11:41 +08:00
Louis Lam
20d59e5a13
fix and move the steam api key to settings page
2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
2021-10-18 15:50:35 +08:00
Bert Verhelst
1d63dd9ddd
fix(monitor): safely get status of previous beat if first beat
2021-10-16 11:28:03 +02:00
Louis Lam
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
2021-10-16 15:06:59 +08:00
Louis Lam
6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2
...
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
2021-10-16 14:30:25 +08:00
NeuralMiner
8cb26d2b31
Text update
2021-10-15 19:12:09 -06:00
Louis Lam
7276f34d90
fix reset-password
2021-10-16 00:57:26 +08:00
Louis Lam
4178983df3
Merge remote-tracking branch 'origin/master'
2021-10-15 19:01:04 +08:00
Louis Lam
cd211a6be7
[http options] fine tune
2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-15 16:07:05 +08:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
2021-10-15 00:54:31 +08:00
Louis Lam
c9b4d2ae2a
Merge pull request #698 from erktime/master
...
Add monitor name context to Slack fallback text.
2021-10-14 23:31:48 +08:00
Louis Lam
3b74b727f2
[Push Type] fix missing important flag and missing up notification
2021-10-14 22:32:15 +08:00
Louis Lam
a7d2a34dae
fix ping bug
2021-10-14 18:48:40 +08:00
Louis Lam
60acb91fc8
Merge pull request #687 from xjoker/master
...
Add new notification `Aliyun Sms` and `DingDing`
2021-10-14 17:02:23 +08:00
Louis Lam
f51156f18e
run eslint for #687
2021-10-14 16:24:03 +08:00
Louis Lam
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
2021-10-14 16:07:25 +08:00
Louis Lam
674b387c95
Merge branch 'master' into smtp-subject
2021-10-14 14:59:54 +08:00
Louis Lam
5ff9a64e5e
[Push Type] Fix missing duration calculation ( #685 )
2021-10-14 14:42:34 +08:00
Louis Lam
4bee57ea7f
Merge remote-tracking branch 'giacomo892/patch-1'
...
# Conflicts:
# server/ping-lite.js
2021-10-14 14:10:51 +08:00
Louis Lam
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
2021-10-14 14:09:16 +08:00
xJoker
6e04ec436e
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:45 +08:00
xJoker
2d471a5e84
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:33 +08:00
xJoker
cae194f58f
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-14 07:34:24 +08:00
Aaron Erkenswick
655ccc86b9
Add monitor name context to Slack fallback text.
...
The text block of a slack notification payload is used for mobile
devices and plain text previews. This change allows slack users to see
the name of the failing service without having to open up Slack to read
the entire message.
2021-10-13 11:47:23 -07:00
Louis Lam
e2dbacb383
Fix encoding problem of ping result for non-English Windows
2021-10-14 00:22:49 +08:00
Lukas
89b34b5748
Use double curly brackets and sanity check for customSubject
2021-10-13 18:05:18 +02:00
wuwenjing
843992c410
Add DingDing notification
2021-10-13 16:13:46 +08:00
wuwenjing
57a76e6129
remove alicloud/pop-core
keep simple
2021-10-13 14:41:59 +08:00
giacomo892
3fe3450533
Prioritize port passed from args
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 08:29:55 +02:00
Lukas
330cd6e058
Minor rehabilitanty impedyment
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 07:32:09 +02:00
wuwenjing
a2f2253221
Add aliyun sms notification
2021-10-13 11:55:01 +08:00
Lukas
30d8aadf12
Slightly refactor
2021-10-12 23:24:34 +02:00
giacomo892
d733ec018e
Prioritize host arg
...
Otherwise launching the program with the --host argument does nothing
2021-10-12 19:37:58 +02:00
Nelson Chan
03b07730d3
Fix: Increase default kept period
2021-10-12 23:28:21 +08:00
Andreas Brett
2538bd04ce
notp verification defaults
2021-10-11 20:18:40 +02:00
xJoker
1bc77a06e5
Update server/notification-providers/feishu.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-11 20:38:32 +08:00
xJoker
69c623ac2b
Update server/notification-providers/feishu.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-11 20:38:19 +08:00
wuwenjing
ce2df137e6
change text to using variable msg
2021-10-11 17:53:13 +08:00
wuwenjing
6d9b71c054
Add Feishu notification
2021-10-11 17:20:09 +08:00
Andreas Brett
e223e826a3
linting
2021-10-11 01:02:54 +02:00
Andreas Brett
b5b391c73b
avoid default values for token verification
...
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640 )
2021-10-10 22:13:18 +02:00
Bert Verhelst
5445c2a2ff
fix(monitor): revert unintentional change to comment
2021-10-10 18:41:29 +02:00
Bert Verhelst
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
2021-10-10 18:40:53 +02:00
Louis
2286f78f57
update to 1.8.0
2021-10-10 16:37:53 +08:00
LouisLam
82131f4dd2
merge conflict
2021-10-10 13:09:30 +08:00
Bert Verhelst
5137c80c07
fix(monitor): handle empty headers
2021-10-09 21:51:24 +02:00
Lukas
792f3c7c5c
Add support for values of Name, Hostname and Status
2021-10-09 21:48:28 +02:00
Lukas
edb75808d8
Merge branch 'louislam:master' into smtp-subject
2021-10-09 20:37:12 +02:00
LouisLam
56ae6f6117
fix demoMode export
2021-10-10 02:36:20 +08:00
Lukas
5e3ea3293c
Very basic email subject customization
2021-10-09 20:32:45 +02:00
LouisLam
5c89562650
not allow lower than 20s for demo mode
2021-10-10 02:23:27 +08:00
Nelson Chan
ac80631bcd
Fix: Run clear data at specific time
2021-10-10 00:16:29 +08:00
Nelson Chan
8caf47988c
Fix: Allow setting settings type
2021-10-10 00:16:13 +08:00
Nelson Chan
dca5a59dbc
Feat: Implement data clearing logic & frontend
2021-10-09 23:33:47 +08:00
Nelson Chan
656a4d6270
WIP: Enable background jobs
...
WIP: Remove better-sqlite3
2021-10-09 21:46:59 +08:00
Bert Verhelst
d71d27220b
fix(edit-monitor): store headers as JSON
2021-10-09 12:42:32 +02:00
Bert Verhelst
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-09 12:35:08 +02:00
LouisLam
23a2d33f8c
[backup] restore pushToken
2021-10-09 17:45:05 +08:00
Bert Verhelst
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-09 11:13:16 +02:00
LouisLam
a15e9077fc
[status page] clear cache if it is an important beat
2021-10-09 17:04:51 +08:00
LouisLam
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
2021-10-08 20:03:52 +08:00
Lukas
db791c880a
Don't use then with await.
2021-10-08 11:49:12 +02:00
Lukas
dfd63386ba
Make PromoSMS actually working
...
Make PromoSMS actually working and inform on success only when API return 0
2021-10-08 09:11:13 +02:00
Lukas
12b5489eb5
PromoSMS as Notification Provider
...
Add PromoSMS (Polish SMS Gateway) as new notification provider
2021-10-07 21:56:32 +02:00
LouisLam
ddad2dcb4a
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/languages/en.js
2021-10-08 01:40:34 +08:00
LouisLam
5b4af550fb
Merge branch 'master' into DeeJayPee_master
2021-10-08 01:27:06 +08:00
LouisLam
3a0143ac46
[matrix] use encodeURIComponent to handle the url encode
2021-10-08 01:11:33 +08:00
LouisLam
2ce5c28ed4
Merge branch 'master' into feature/matrix-notifications
...
# Conflicts:
# src/languages/en.js
2021-10-08 00:59:39 +08:00
Bert Verhelst
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-07 18:22:59 +02:00
LouisLam
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
2021-10-07 17:39:58 +08:00
Bert Verhelst
162ef04c41
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-06 21:56:28 +02:00
Gero Gerke
6bebc623f9
UI polish
2021-10-05 21:59:58 +02:00
Gero Gerke
34b86352f2
remove double spaces
2021-10-05 21:40:59 +02:00
Gero Gerke
99e8a33118
escape room characters
2021-10-05 21:36:01 +02:00
Gero Gerke
d7cc585101
Update server/notification-providers/matrix.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-05 20:42:44 +02:00
Gero Gerke
5decfb9fad
Matrix Notifications
2021-10-05 20:03:56 +02:00
DeeJayPee
bc4db6c692
Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master
2021-10-05 19:57:27 +02:00
DeeJayPee
f14a798b2c
Fix indentation + typo
2021-10-05 19:43:04 +02:00
Bert Verhelst
550825927c
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-05 18:19:07 +02:00
LouisLam
edad2caf8e
return the correct exit code from jest
2021-10-05 20:40:40 +08:00
LouisLam
49720c709c
improve the test with a single command only "npm test"
2021-10-05 19:13:57 +08:00
Louis Lam
865b721b79
Merge pull request #519 from chakflying/improve-certInfo
...
Feat: Improve Certificate Info Display
2021-10-05 16:09:08 +08:00
Bert Verhelst
6b44116245
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-05 08:54:40 +02:00
LouisLam
a2a4c70cf5
setup jest-puppeteer
2021-10-03 18:16:55 +08:00
Bert Verhelst
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
2021-10-02 16:48:27 +02:00
Nelson Chan
13bdfefa9d
Feat: Improve Certificaet Info Display
2021-10-01 18:56:28 +08:00
LouisLam
7fa1cb83af
[push type] add ping parameter
2021-10-01 16:43:11 +08:00
LouisLam
8d5eaaf8a7
minor
2021-10-01 00:26:27 +08:00
LouisLam
b246c8e0f2
Fix 2fa for iOS Google authenticator ( #486 )
2021-10-01 00:23:18 +08:00
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
LouisLam
6eceb4c744
Merge remote-tracking branch 'origin/master'
2021-09-29 17:20:58 +08:00
LouisLam
3e4154dfb5
Fix retry interval affected bug
2021-09-29 17:20:35 +08:00
Louis Lam
fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor
...
Fix: clear important beats after deleteMonitor
2021-09-29 15:39:57 +08:00
Denis Freund
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
LouisLam
0afa3a2c21
Merge branch '1.6.X'
...
# Conflicts:
# server/database.js
# server/server.js
2021-09-24 19:12:57 +08:00
Nelson Chan
662c97dcde
Fix: Fix importing tag if tag doesn't exist
2021-09-24 14:34:53 +08:00
Ponkhy
7fb55b8875
Fixed issues
2021-09-23 17:31:01 +02:00
Ponkhy
4786514e9f
Merge branch 'louislam:master' into import-export
2021-09-23 17:24:53 +02:00
Nelson Chan
32c9dfbb31
Fix: clear important beats after deleteMonitor
2021-09-23 23:21:08 +08:00
Ponkhy
d3d4363031
Used compare-version instead of replace
2021-09-23 17:15:11 +02:00
Adam Stachowicz
f6a984b671
start-server-dev. Fixes #460
2021-09-23 12:45:30 +02:00
LouisLam
23a63213aa
Merge branch 'master' into import-export
...
# Conflicts:
# server/server.js
2021-09-23 17:20:13 +08:00
LouisLam
0a5a6e6a4b
[status page] fix monitor order
2021-09-22 15:23:58 +08:00
LouisLam
fe0fc63843
[status page] send uptime
2021-09-22 15:10:08 +08:00
LouisLam
8c7ee94769
add modified apicache library with disabling client cache
2021-09-22 00:58:22 +08:00
LouisLam
15c00d9158
upload logo and expose ./data/upload to url
2021-09-21 21:22:35 +08:00
LouisLam
469e8f6fd6
Merge branch 'master' into public-dashboard
...
# Conflicts:
# package-lock.json
2021-09-21 17:05:13 +08:00
LouisLam
4591adc05e
second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
2021-09-21 01:15:20 +08:00
LouisLam
5f6aa32844
fix store/fetch status page config
2021-09-20 20:44:07 +08:00
LouisLam
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
2021-09-20 18:48:44 +08:00
LouisLam
34c0fa59a8
fix reset-password ( #448 )
...
(cherry picked from commit b0e9c5bcb4
)
2021-09-20 16:33:22 +08:00
LouisLam
b0e9c5bcb4
fix reset-password ( #448 )
2021-09-20 16:29:18 +08:00
LouisLam
0b572df3d0
[status page] store config
2021-09-20 16:22:18 +08:00
LouisLam
7ee98d989c
[status page] implement rest api for heartbeat
2021-09-19 23:24:51 +08:00
LouisLam
fd95d41d9f
[status page] many update and save group list
2021-09-19 19:04:51 +08:00
Louis
a6fdd272a6
[status page] minor
2021-09-17 14:42:19 +08:00
Ponkhy
1b5e723f60
Added descriptions to uploadBackup function
2021-09-17 03:25:18 +02:00
Ponkhy
4bdada36a9
Removed if includes version
2021-09-16 20:18:31 +02:00
LouisLam
9b8f01cfc6
since eslint can auto fix semicolon, standardize all end with semicolon
2021-09-16 22:57:34 +08:00
LouisLam
2955abb5d9
[status page] create incident
2021-09-16 22:48:28 +08:00
Ponkhy
8b463e70df
Apply suggestions from @Saibamen
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-16 12:29:33 +02:00
LouisLam
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
2021-09-16 16:53:54 +08:00
Ponkhy
54aa68ec58
Added import/export compatibility for version 1.7
2021-09-15 22:07:28 +02:00
Louis Lam
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
2021-09-16 00:21:53 +08:00
LouisLam
80322cbfe7
Merge branch 'import-export'
...
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
2021-09-16 00:18:07 +08:00
LouisLam
7e0272077b
cleanup demo mode code
2021-09-16 00:13:28 +08:00
LouisLam
512ff09cca
set entry page
2021-09-15 20:40:26 +08:00
LouisLam
e8f4fabcd0
[status page] crop and resize logo
2021-09-15 18:28:48 +08:00
LouisLam
2ab06f87b8
Merge branch 'master' into public-dashboard
2021-09-15 16:46:05 +08:00
Louis Lam
76db55b657
Merge pull request #395 from WillianRod/feat/add-microsoft-teams-notification
...
Add microsoft teams notification provider
2021-09-15 16:38:57 +08:00
LouisLam
1693873f4a
[Teams] change handleTestNotification to GeneralNotification
2021-09-15 16:38:28 +08:00
LouisLam
db05b506f3
[status page] checkpoint
2021-09-15 14:34:30 +08:00
No0Vad
1300448bed
Adjustments to the retry interval
...
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
2021-09-15 00:59:06 +02:00
LouisLam
1d6670ed9a
Merge branch 'master' into public-dashboard
2021-09-14 23:29:22 +08:00
LouisLam
3234aec5b3
NODE_ENV if not set, change to production
2021-09-14 23:28:38 +08:00
LouisLam
afe91078c4
[status page] checkpoint
2021-09-14 23:27:11 +08:00
LouisLam
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
2021-09-14 15:05:04 +08:00
Louis Lam
069c811af8
Merge pull request #278 from chakflying/tags
...
Monitor: Tags with metadata
2021-09-14 14:57:53 +08:00
LouisLam
f9311e4e7f
[status page]
2021-09-14 14:55:45 +08:00
LouisLam
d7a230ac15
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
# src/main.js
2021-09-14 14:16:24 +08:00
LouisLam
97360dab26
add /.well-known/change-password
2021-09-14 12:10:25 +08:00
Willian Rodrigues Barbosa
ccb8736b3d
fix: send msg if heartbeat message is not set
2021-09-13 14:02:52 -03:00
Louis Lam
2c02dad1f9
Merge pull request #393 from Revyn112/master
...
add possibility to have a prefixMessage in discord notification before the embed
2021-09-13 20:02:55 +08:00
DeeJayPee
29d0db805d
Add legacy octopush (Octopush-DM from 2011 to 2020 accounts) version
2021-09-13 10:25:44 +02:00
Nelson Chan
a0e4e96160
Fix: Fix tag removal, reuse and validation
2021-09-13 14:12:17 +08:00
Nelson Chan
6e3a904aaa
WIP: Add tags functionality
...
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
2021-09-13 14:12:11 +08:00
No0Vad
2617e1f4d8
Update database.js
2021-09-13 00:25:18 +02:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
2021-09-13 00:19:51 +02:00
LouisLam
e205adfd7b
[status page] developing
2021-09-13 02:26:45 +08:00
Willian Rodrigues Barbosa
063d64eec8
feat: add microsoft teams notification provider
2021-09-12 14:46:59 -03:00
LouisLam
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
2021-09-13 01:09:01 +08:00
Ponkhy
d313966d80
Merge branch 'master' into import-export
2021-09-12 18:46:11 +02:00
Denis Freund
8352d9abbe
add posibility to have a prefixMessage before the embed
2021-09-12 17:54:12 +02:00
No0Vad
389d247463
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 17:05:23 +02:00
Ponkhy
7fee4a7ea7
Added import options
2021-09-11 21:53:17 +02:00
LouisLam
c4f78d776e
[2fa] "UptimeKuma" to "Uptime Kuma"
2021-09-12 02:25:51 +08:00
No0Vad
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
LouisLam
934685637a
[Status Page] WIP: Checkpoint
2021-09-11 23:43:07 +08:00
Ponkhy
295ccba44b
Adjusted for new db patch management
2021-09-11 16:37:33 +02:00
Ponkhy
8cd5bad44c
Merge branch 'master' into 2fa
2021-09-11 16:32:11 +02:00
Ponkhy
f6d1a82989
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:19 +02:00
Ponkhy
651b525d06
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:12 +02:00
LouisLam
3e25f0e9d9
[Status Page] WIP: Checkpoint
2021-09-11 19:40:03 +08:00
LouisLam
08de0090dc
add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0
2021-09-10 17:23:45 +08:00
Ponkhy
59cccf8c50
Fixed typo
2021-09-09 21:12:29 +02:00
Ponkhy
403202d4d4
Added simple TOTP Two Factor Authentication
2021-09-09 21:10:31 +02:00
LouisLam
573c7faddd
switch on the notification, if it is added in EditMonitor.vue
2021-09-09 21:24:29 +08:00
LouisLam
e330875c80
fix restore fail if no isDefault
2021-09-09 20:22:32 +08:00
Louis Lam
331ae5ec20
Merge pull request #306 from Ponkhy/import-export
...
Added import and export function
2021-09-09 16:15:48 +08:00
LouisLam
8ee34c7904
also handle the first beat problem in uptime
2021-09-09 15:55:34 +08:00
LouisLam
4f07c2ea9a
uptime calculation fully sum in sql
2021-09-09 15:46:28 +08:00
LouisLam
24facc79d7
sendHeartbeatList use raw data
2021-09-09 11:57:23 +08:00
LouisLam
9f9c1007d7
increase sqlite cache size from 2MB to 12MB
2021-09-09 11:56:42 +08:00
LouisLam
dd283423ab
improve smtp with cc, bbc and ignore tls
2021-09-09 01:13:09 +08:00
LouisLam
6006038689
fix monitor.stop() in some cases
2021-09-08 20:00:16 +08:00
LouisLam
a7b50c3630
Revert "add user-monitor-list"
...
This reverts commit 230a9bfaf9
.
2021-09-08 19:54:38 +08:00
LouisLam
0ddbac5109
Revert "move userMonitorList out of server.js"
...
This reverts commit a7cf14c663
.
2021-09-08 19:54:38 +08:00
LouisLam
0f440596c8
Revert "cache last heartbeat list in memory"
...
This reverts commit 87678ea92d
.
2021-09-08 19:54:37 +08:00
LouisLam
87678ea92d
cache last heartbeat list in memory
2021-09-08 18:58:02 +08:00
LouisLam
a7cf14c663
move userMonitorList out of server.js
2021-09-08 16:27:37 +08:00
LouisLam
230a9bfaf9
add user-monitor-list
2021-09-08 14:16:30 +08:00
Ponkhy
1ef4562905
Paused monitors stay paused after import
2021-09-07 23:32:25 +02:00
LouisLam
62712f5cc4
Merge branch 'master' into import-export
2021-09-08 00:18:43 +08:00
LouisLam
0aeaf87f5b
Merge branch 'master' into default-notification
...
# Conflicts:
# server/notification.js
# src/components/NotificationDialog.vue
2021-09-07 23:40:42 +08:00
LouisLam
da74391c3e
convert notifications into modules
2021-09-07 22:42:46 +08:00
Ponkhy
242e494cb5
Merge branch 'master' into import-export
2021-09-07 14:12:53 +02:00
Ponkhy
4faa409027
Merge branch 'master' into default-notification
2021-09-07 14:07:50 +02:00
LouisLam
da131a5156
Merge branch 'master' into clear-monitor-data
...
# Conflicts:
# src/languages/da-DK.js
# src/languages/en.js
# src/languages/es-ES.js
# src/languages/fr-FR.js
# src/languages/ja.js
# src/languages/ko-KR.js
# src/languages/nl-NL.js
# src/languages/ru-RU.js
# src/languages/sr-latn.js
# src/languages/sr.js
# src/languages/sv-SE.js
# src/languages/zh-CN.js
# src/languages/zh-HK.js
2021-09-07 17:36:37 +08:00
Ponkhy
fd8c95d64e
Merge branch 'master' into default-notification
2021-09-05 23:32:31 +02:00
Ponkhy
58240aceef
Added the option for default notifications
2021-09-05 23:23:06 +02:00
Louis Lam
f9c177b150
Merge pull request #315 from tgxn/patch-1
...
Notifications Content Improvements: SMTP, LunaSea, PushBullet
2021-09-05 11:52:50 +08:00
LouisLam
299506ce45
reset the heartbeat list instead of reload the page after cleared events or heartbeats
2021-09-05 02:03:40 +08:00
Domenic Horner
41d32bb9dd
Undo parm changes
2021-09-04 20:08:18 +08:00
Domenic Horner
b0acda52f9
Add time to smtp body content
2021-09-04 11:27:18 +08:00
Domenic Horner
e9cd9be03a
Use constants for UP/DOWN through notifications class
2021-09-04 11:09:34 +08:00
Domenic Horner
6ae279c7f3
Move title generation to notification class
2021-09-04 11:06:06 +08:00
Domenic Horner
9c32adfb55
Update pushbullet down body
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:26:44 +08:00
Domenic Horner
d346afd33b
Update pushbullet up body
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:26:38 +08:00
Domenic Horner
3bf380c684
Update lunasea "up" body content
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:26:10 +08:00
Domenic Horner
dca5c59982
Update lunasea body content
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:24:43 +08:00
Ponkhy
8f9a973ede
Merge branch 'master' into import-export
2021-09-04 01:26:48 +02:00
LouisLam
ebf362754c
Merge branch 'master' into clear-monitor-data
2021-09-03 14:56:43 +08:00
LouisLam
e31be8caf5
demo mode
2021-09-02 22:52:20 +08:00
LouisLam
60f2f08cea
add demo db
2021-09-02 22:39:04 +08:00
LouisLam
b1647a310e
add demo db
2021-09-02 22:37:51 +08:00
Ponkhy
7d70c4d8cd
Code optimizations
2021-09-02 16:13:31 +02:00
Domenic Horner
532ad3044c
Add space to pushbullet and lunasea notifications
...
Start changes regarding standardization of notification messages
2021-09-02 21:55:25 +08:00
LouisLam
f23ecef636
add missing cert parameters
2021-09-02 21:16:04 +08:00
LouisLam
51cf2ff6f9
add missing cert parameters
2021-09-02 21:13:59 +08:00
LouisLam
b30b1d3a52
create data dir before copy
2021-09-02 21:11:20 +08:00
LouisLam
582e14098d
create data dir before copy
2021-09-02 21:10:18 +08:00
LouisLam
6e3e2fc85c
fix db path
2021-09-02 21:08:00 +08:00
LouisLam
b604807cfe
create data dir if not exists
2021-09-02 20:42:55 +08:00
LouisLam
3ee13bddd1
dash style for args
2021-09-02 20:36:52 +08:00
LouisLam
c74986647e
allow changing data dir
2021-09-02 20:27:18 +08:00
LouisLam
b88b357b55
add support for https
2021-09-02 20:18:27 +08:00
Ponkhy
2dd392e609
Added uptime kuma version to backup file
2021-09-02 10:15:25 +02:00
Ponkhy
c13cc62d3d
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-01 21:32:33 +02:00
Ponkhy
b604910bbb
Merge branch 'master' into clear-monitor-data
2021-09-01 17:17:40 +02:00
Ponkhy
2f6c5963c5
Added import and export function
2021-09-01 17:09:32 +02:00
LouisLam
e4b76717be
revert back to node-sqlite3
2021-09-01 15:02:04 +08:00
LouisLam
cd1a3a2fb9
revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems
2021-09-01 14:33:00 +08:00
Ponkhy
7b92166d18
Added clear all db statistics function
2021-09-01 00:36:24 +02:00
Ponkhy
1341d220ed
Merge branch 'louislam:master' into clear-monitor-data
2021-08-31 23:22:45 +02:00
LouisLam
697fa6bdfd
fix discord notification appended port unexpectedly
2021-08-31 22:15:02 +08:00
LouisLam
527e0c3444
raise the ping timeout from 2s to 10s (avoid #294 )
2021-08-31 22:14:33 +08:00
LouisLam
a41534ca60
no declare vars with comma, one line only one statement
2021-08-31 22:08:05 +08:00
LouisLam
ec731d174d
Merge branch 'MichelBaie_master'
2021-08-31 20:02:39 +08:00
LouisLam
0d65918a6a
change bcrypt to bcryptjs, use my own prebuilt better-sqlite3, supports more prebuilt
2021-08-31 19:56:44 +08:00
LouisLam
bf29f28726
send stats only if there is at least one client in the room
2021-08-30 14:55:33 +08:00
Ponkhy
1952e34110
Added the possibility to clear monitor data
2021-08-29 18:47:01 +02:00
LouisLam
ada6606217
move the new sql to patch8.sql
2021-08-29 11:16:06 +08:00
Ponkhy
858affa808
Removed useless database query
2021-08-28 21:29:24 +02:00
Ponkhy
303adbf9b1
Show latest dns result in Details.vue
2021-08-28 21:20:25 +02:00
Louis Lam
7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
...
Added DNS Monitor Type
2021-08-28 00:21:10 +08:00
Louis Lam
d2f0a15076
Merge pull request #264 from antiseptikk/master
...
feat: add rocket.chat notification
2021-08-26 23:34:07 +08:00