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

..

AddStatusPage.vue

Added JSDoc for src/pages/*

2022-06-02 13:46:44 +01:00

Dashboard.vue

Tidy up

2022-09-17 22:09:09 +08:00

DashboardHome.vue

Tidy up

2022-09-17 22:09:09 +08:00

Details.vue

Real browser monitor type (#3308)

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

EditMaintenance.vue

Merge branch 'master' into group-monitors

2023-05-31 20:51:33 +02:00

EditMonitor.vue

Real browser monitor type (#3308)

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

Entry.vue

Database Setup Page (#2738)

2023-02-11 14:41:02 +08:00

List.vue

Fix: misc. layout fix on mobile

2022-06-14 22:43:44 +08:00

MaintenanceDetails.vue

Added JSDoc for src/

2023-01-05 22:55:51 +00:00

ManageMaintenance.vue

add keys for translation

2023-02-05 01:07:20 +01:00

ManageStatusPage.vue

Fix logo height in the status page list

2022-06-21 15:46:22 +08:00

NotFound.vue

Update NotFound.vue

2023-06-13 16:10:41 +03:00

Settings.vue

Updated API Keys UI

2023-02-26 18:07:57 +00:00

Setup.vue

Fix change language issue in the setup page

2023-02-06 22:35:56 +08:00

SetupDatabase.vue

Database Setup Page (#2738)

2023-02-11 14:41:02 +08:00

StatusPage.vue

Merge branch 'master' into group-monitors

2023-05-31 20:51:33 +02:00