12 commits

Author	SHA1	Message	Date
Philipp Dormann	6863f30c5e	⏫ dependency bumps	2021-08-03 15:37:50 +02:00
Philipp Dormann	1bb9700ae3	Merge branch 'master' of https://github.com/louislam/uptime-kuma ... # Conflicts: # README.md # dockerfile # package-lock.json # package.json # server/model/monitor.js # server/notification.js # src/components/NotificationDialog.vue # src/layouts/Layout.vue # src/pages/EditMonitor.vue	2021-08-03 15:05:17 +02:00
Philipp Dormann	5494bce9fe	Merge remote-tracking branch 'MakeMonmouth/feature/add_prometheus_metrics' ... # Conflicts: # README.md # package-lock.json # package.json # server/model/monitor.js	2021-07-24 19:32:11 +02:00
Philipp Dormann	7eeeffd2cf	🧹 cleanups from merge	2021-07-24 19:25:36 +02:00
Philipp Dormann	20f2302d93	🚑 fix yarn lockfile	2021-07-14 22:09:20 +02:00
Philipp Dormann	10d751ea07	Merge remote-tracking branch 'upstream/master' ... # Conflicts: # dockerfile # package-lock.json # package.json # server/server.js	2021-07-13 18:40:20 +02:00
Philipp Dormann	72a3b60a36	add release config	2021-07-13 12:58:59 +02:00
Philipp Dormann	4c2b3a0f3e	⏫ bump vue@3.1.4	2021-07-13 12:56:01 +02:00
Philipp Dormann	c4bc95927f	⏫ dependency bumps	2021-07-12 22:09:27 +02:00
Philipp Dormann	900219deb1	Merge remote-tracking branch 'theguydanish/master' ... # Conflicts: # package-lock.json # package.json	2021-07-12 21:58:13 +02:00
Philipp Dormann	5515437eab	🧹 cleanup	2021-07-12 21:47:32 +02:00
Philipp Dormann	e568cad22c	⏫ dependency bump + version pin	2021-07-12 00:25:22 +02:00