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

..

jobs

send certificate notifications in 21, 14, 7 days

2021-10-27 15:33:15 +08:00

model

Merge branch 'master' into mqtt2

2022-04-16 13:28:39 +08:00

modules/apicache

Generated documentation :)

2021-11-09 21:24:31 -08:00

notification-providers

Fix spelling and merge mistake

2022-04-14 10:58:28 +08:00

routers

Change log_info to log.info by making it into an object

2022-04-13 23:33:37 +08:00

socket-handlers

Enforce semicolon, fix format globally

2022-04-14 01:20:54 +08:00

2fa.js

add remove-2fa command

2021-11-18 18:22:03 +08:00

auth.js

Merge pull request #910 from andreasbrett/logging

2022-04-13 23:47:08 +08:00

check-version.js

Fix "Check Update" is not checked by default

2022-04-05 19:43:23 +08:00

client.js

Merge branch 'master' into fluencydoc_master

2022-04-12 17:44:04 +08:00

config.js

fix reset-password

2021-10-16 00:57:26 +08:00

database.js

Merge branch 'master' into mqtt2

2022-04-16 13:28:39 +08:00

image-data-uri.js

Merge pull request #910 from andreasbrett/logging

2022-04-13 23:47:08 +08:00

jobs.js

Change log_info to log.info by making it into an object

2022-04-13 23:33:37 +08:00

logger.js

Change log_info to log.info by making it into an object

2022-04-13 23:33:37 +08:00

notification.js

Fix spelling and merge mistake

2022-04-14 10:58:28 +08:00

password-hash.js

Enforce semicolon, fix format globally

2022-04-14 01:20:54 +08:00

ping-lite.js

Merge branch 'master' into fluencydoc_master

2022-04-12 17:44:04 +08:00

prometheus.js

Enforce semicolon, fix format globally

2022-04-14 01:20:54 +08:00

proxy.js

Reload proxy settings for monitors in the monitorList

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

rate-limiter.js

Change log_info to log.info by making it into an object

2022-04-13 23:33:37 +08:00

server.js

Merge branch 'master' into mqtt2

2022-04-16 13:28:39 +08:00

util-server.js

Merge branch 'master' into mqtt2

2022-04-16 13:28:39 +08:00