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 |