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

..

jobs

Update JSDoc for better clarity

2022-04-22 18:42:47 +01:00

model

Merge remote-tracking branch 'origin_kuma/master'

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

modules/apicache

Made value nullable in apicache JSDoc

2022-04-22 19:42:42 +01:00

notification-providers

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

routers

Merge remote-tracking branch 'origin_kuma/master'

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

socket-handlers

Add JSDoc to server/socket-handlers/*

2022-04-21 17:10:23 +01:00

2fa.js

Add JSDoc to server/*

2022-04-20 19:56:40 +01:00

auth.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

check-version.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

client.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

config.js

fix reset-password

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

database.js

Merge remote-tracking branch 'origin_kuma/master'

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

image-data-uri.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

jobs.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

notification.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

password-hash.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

ping-lite.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

prometheus.js

Merge pull request #1565 from Saibamen/eslint

2022-04-27 15:00:49 +08:00

proxy.js

Update linters

2022-04-26 01:26:57 +02:00

rate-limiter.js

Merge branch 'master' into add-JSDoc-comments

2022-04-21 13:01:22 +01:00

server.js

Merge remote-tracking branch 'origin_kuma/master'

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

uptime-kuma-server.js

Merge code manually since some code moved to another file

2022-04-19 16:46:45 +08:00

util-server.js

Merge pull request #1565 from Saibamen/eslint

2022-04-27 15:00:49 +08:00