200fdfb808
Merge code manually since some code moved to another file
2022-04-19 16:46:45 +08:00
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
2022-04-19 16:43:13 +08:00
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
2022-04-19 15:38:59 +08:00
addf75daa7
Fix MQTT password do not save
2022-04-18 19:05:14 +08:00
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
e6a8a84278
Include only nessacary data in webhook
2022-04-17 19:30:58 +08:00
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +08:00
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
2022-04-16 13:28:39 +08:00
0a5db0cecb
Fix #1478
2022-04-14 10:12:31 +08:00
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
2022-04-13 23:47:08 +08:00
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
4053b9db1f
Merge remote-tracking branch 'origin/master'
2022-04-12 17:46:24 +08:00
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
2022-04-12 17:44:04 +08:00
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
2022-04-12 17:15:33 +08:00
94770cf865
Resolve log message null reference
2022-04-12 16:57:22 +08:00
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
2022-04-12 16:32:14 +08:00
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
5027fcd320
Export server using an object class
2022-04-07 23:02:57 +08:00
d5e68f8453
Export monitor list
2022-04-07 22:53:32 +08:00
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
2022-04-07 14:45:37 +08:00
c4e74c9943
Render <StatusPage> if domain matched
2022-04-06 22:43:22 +08:00
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
48d679234a
Stop bree and cloudflared while the server shutting down
2022-04-05 19:41:29 +08:00
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
2022-04-01 14:57:35 +08:00
b72a2d350f
Set cloudflared token from env var or arg
2022-03-30 20:08:26 +08:00
82ea896bbc
Improve the workflow of cloudflared
2022-03-30 11:59:49 +08:00
a6b52b7ba6
Merge branch 'master' into cloudflared
2022-03-29 17:42:55 +08:00
b8dea3a823
Merge remote-tracking branch 'origin/master'
2022-03-29 17:39:12 +08:00
0da6e6b1fb
Some improvements
2022-03-29 17:38:48 +08:00
44fb2a88f2
Add cloudflared socket handler
2022-03-29 14:48:02 +08:00
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
2022-03-27 11:05:50 +08:00
3adda48f3a
Load the status page list earlier
2022-03-21 15:28:59 +08:00
719a136d1e
[Status Page] Improved entry page
2022-03-17 22:44:47 +08:00
50d6e888c2
[new status page] wip
2022-03-10 21:34:30 +08:00
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
2022-03-06 19:34:49 +03:00
d1a99b0a22
Check Node.js version, better error message
2022-01-15 01:25:28 +08:00
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
2022-01-13 11:53:08 +08:00
32ec4beda0
Merge branch 'master' into mqtt
2022-01-13 11:24:45 +08:00
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +08:00
ed64853125
Keep FBSD, BSD for ping only
2022-01-12 01:44:01 +08:00
0f822d3b2a
FBSD does not exists anymore
2022-01-11 13:42:51 +01:00
6bda5c6329
update comment
2022-01-11 13:39:45 +01:00
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
2022-01-11 19:15:28 +08:00
0bbe157099
change parsing priority for all passed arguments
...
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
2022-01-08 18:32:42 +01:00
0053a29d10
add validation to port value parsing
...
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
2022-01-08 18:27:39 +01:00
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
2022-01-08 18:25:12 +01:00
1bbd744d02
Chore: Improve syntax
2022-01-07 14:29:42 +08:00
2e0e35a1ee
Fix: Fix typo
2022-01-07 12:34:01 +08:00
1e92487f30
Chore: Remove onDelete as unused
2022-01-07 12:28:08 +08:00
Louis Lam
Uğur Erkan
Denis
Marc Harnos
Nelson Chan