Louis Lam 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

..

cloudflared-socket-handler.js

Stop bree and cloudflared while the server shutting down

2022-04-05 19:41:29 +08:00

database-socket-handler.js

add auto vacuum and shrink database button

2021-10-26 23:02:32 +08:00

proxy-socket-handler.js

Reload proxy settings for monitors in the monitorList

2022-04-07 23:03:45 +08:00

status-page-socket-handler.js

Merge branch 'master' into logging

2022-04-12 16:32:14 +08:00