Karel Krýda 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

2022-04-30 13:40:34 +02:00

..

group.js

Fix JSDoc grammar

2022-04-22 19:10:13 +01:00

heartbeat.js

Merge remote-tracking branch 'origin_kuma/master'

2022-04-30 13:40:34 +02:00

incident.js

Fix JSDoc grammar

2022-04-22 19:10:13 +01:00

maintenance.js

minor fixes (missing commas, spaces, translations)

2022-01-23 20:33:39 +01:00

monitor.js

Merge remote-tracking branch 'origin_kuma/master'

2022-04-30 13:40:34 +02:00

proxy.js

Fix JSDoc grammar

2022-04-22 19:10:13 +01:00

status_page.js

Fix JSDoc grammar

2022-04-22 19:10:13 +01:00

tag.js

Fix JSDoc grammar

2022-04-22 19:10:13 +01:00

user.js

Updated server/model/* JSDoc to match new methods

2022-04-21 18:30:04 +01:00