Louis Lam 16a1a66e09 Merge remote-tracking branch 'origin/master' into 2.0.X ...

# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/debian-base.dockerfile
#	docker/dockerfile
#	package.json
#	server/database.js
#	server/jobs/util-worker.js
#	server/model/maintenance.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/uptime-kuma-server.js

2023-06-30 13:38:56 +08:00

..

jobs

Merge remote-tracking branch 'origin/master' into 2.0.X

2023-06-30 13:38:56 +08:00

model

Merge remote-tracking branch 'origin/master' into 2.0.X

2023-06-30 13:38:56 +08:00

modules

Relocate and fix jsesc issue

2023-02-04 16:58:39 +08:00

monitor-types

Real browser monitor type (#3308)

2023-06-27 15:54:33 +08:00

notification-providers

Strip trailing slashes to avoid 404

2023-06-18 18:28:30 +02:00

routers

Merge remote-tracking branch 'origin/master' into 2.0.X

2023-06-30 13:38:56 +08:00

socket-handlers

Real browser monitor type (#3308)

2023-06-27 15:54:33 +08:00

2fa.js

Add JSDoc to server/*

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

auth.js

Chore: Add logging for failed auth

2023-06-26 04:49:49 +08:00

cacheable-dns-http-agent.js

Added JSDoc for server/

2023-01-05 22:19:05 +00:00

check-version.js

Fix check version

2022-12-05 19:17:24 +08:00

client.js

Added basic web interface for API keys

2023-02-14 19:49:04 +00:00

config.js

Feat: Expand and Simplify Badge Functionality (#2211)

2023-02-03 12:33:48 +08:00

database.js

Merge remote-tracking branch 'origin/master' into 2.0.X

2023-06-30 13:38:56 +08:00

docker.js

[Docker Monitor] Change tcp:// to http://

2022-10-04 16:19:56 +08:00

embedded-mariadb.js

WIP

2023-02-05 18:01:54 +08:00

git.js

HTTPS Monitor using Real Browsers + Limited plugin support (#1787)

2023-01-27 18:25:57 +08:00

google-analytics.js

Trim

2023-02-04 17:03:00 +08:00

image-data-uri.js

Merge branch 'master' into add-JSDoc-comments

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

jobs.js

Fix: Use croner for clear-old-data

2023-05-13 00:59:58 +08:00

notification.js

Merge pull request #2980 from Genc/feature/twilio-notification-provider

2023-03-26 15:38:53 +08:00

password-hash.js

Merge branch 'master' into add-JSDoc-comments

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

plugin.js

HTTPS Monitor using Real Browsers + Limited plugin support (#1787)

2023-01-27 18:25:57 +08:00

plugins-manager.js

Fix plugin installation

2023-01-28 19:00:13 +08:00

prometheus.js

Fix: prometheus monitor_status metric has 4 values

2023-06-10 20:22:33 +02:00

proxy.js

Fix: Pass rejectUnauthorized to Socks Proxy

2023-03-28 11:40:19 +08:00

rate-limiter.js

Switched to using Authorization header

2023-02-15 21:53:49 +00:00

server.js

Merge remote-tracking branch 'origin/master' into 2.0.X

2023-06-30 13:38:56 +08:00

settings.js

Fix Uptime Kuma cannot be stopped

2022-12-08 19:13:47 +08:00

setup-database.js

WIP: building database in knex.js

2023-02-11 22:21:06 +08:00

uptime-cache-list.js

Added JSDoc for server/

2023-01-05 22:19:05 +00:00

uptime-kuma-server.js

Real browser monitor type (#3308)

2023-06-27 15:54:33 +08:00

util-server.js

Merge remote-tracking branch 'origin/master' into 2.0.X

2023-06-30 13:38:56 +08:00