Merge remote-tracking branch 'origin/master' into ntml-auth

# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
This commit is contained in:
Louis Lam 2022-06-14 10:36:29 +08:00
commit 6682839ec8
76 changed files with 6128 additions and 908 deletions

View file

@ -58,6 +58,7 @@ class Database {
"patch-monitor-expiry-notification.sql": true,
"patch-status-page-footer-css.sql": true,
"patch-added-mqtt-monitor.sql": true,
"patch-add-sqlserver-monitor.sql": true,
"patch-add-other-auth.sql": { parents: [ "patch-monitor-basic-auth.sql" ] },
};