Karel Krýda
|
9a35386841
|
Merge branch 'master' into master
|
3 years ago |
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
3 years ago |
|
Karel Krýda
|
2b14bdae62
|
Merge branch 'master' into master
|
3 years ago |
|
Louis Lam
|
53b98ad3e4
|
Add more comment for aliyun-sms fix
|
3 years ago |
Karel Krýda
|
31b90d12a4
|
Added the ability to choose on which status pages maintenance information should be displayed
|
3 years ago |
|
Karel Krýda
|
b4ffcc5555
|
Added JSDoc
|
3 years ago |
GOGOsu
|
73e38a13d2
|
Update server/notification-providers/aliyun-sms.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
|
3 years ago |
|
Karel Krýda
|
f78d01d770
|
Resolve lint errors
|
3 years ago |
|
Karel Krýda
|
7532acc95d
|
Resolve conflicts
|
3 years ago |
|
Karel Krýda
|
ed84e56a85
|
Merge remote-tracking branch 'origin_kuma/master'
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
|
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 |
|
Louis Lam
|
1687de163c
|
Merge pull request #1565 from Saibamen/eslint
Fix some of ESLint warnings
|
3 years ago |
Adam Stachowicz
|
1e595eaa76
|
Update linters
|
3 years ago |
|
Adam Stachowicz
|
5fbfacf5ce
|
Fix ESlint warnings
|
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 |
|
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 |
|
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 |
|
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 |
|
Matthew Nickson
|
03b2d8d521
|
Add JSDoc to server/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
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 |
