25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
3 years ago
7da9f139c1
Bug fix
3 years ago
9a35386841
Merge branch 'master' into master
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
b4ffcc5555
Added JSDoc
3 years ago
f78d01d770
Resolve lint errors
3 years ago
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
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
5fbfacf5ce
Fix ESlint warnings
3 years ago
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
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
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
359a490ae3
Fix #1510
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
e6a8a84278
Include only nessacary data in webhook
3 years ago
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
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
649f3106e1
Enforce semicolon, fix format globally
3 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
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
c9fa183712
Manage domain names
3 years ago
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
3 years ago
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
e87cdf4d09
[Status Page] wip, upload logo and status page listing
3 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
18ec42b060
[Status Page] wip
3 years ago
50d6e888c2
[new status page] wip
3 years ago
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
3 years ago
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
3 years ago
595cd93220
Check invalid interval
3 years ago
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
3 years ago
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
22256dfcd2
added timeout for removing the dead loop state
3 years ago
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
1e92487f30
Chore: Remove onDelete as unused
3 years ago
Karel Krýda
Louis Lam
Karel Krýda
Adam Stachowicz
Matthew Nickson
Uğur Erkan
Tarun Singh
Nelson Chan