Commit Graph

280 Commits

Author SHA1 Message Date
Louis Lam ffb7ba176c Merge remote-tracking branch 'origin/master' into status-page-inject-html 2022-05-30 14:00:39 +08:00
Louis Lam 857e88b27e Update to 1.16.1 2022-05-29 12:47:07 +08:00
Louis Lam df4ce811d9 Merge remote-tracking branch 'origin/master' into kaysond_master
# Conflicts:
#	server/model/monitor.js
2022-05-28 23:19:58 +08:00
Louis Lam 334cb57fed Update to 1.16.0 2022-05-26 19:32:52 +08:00
Louis Lam 398219f847 Update to 1.16.0-beta.0 2022-05-17 01:03:51 +08:00
Louis Lam 59be9bb971 working 2022-05-11 00:51:11 +08:00
Louis Lam 4e3258579d Merge branch 'master' into uptime-badges
# Conflicts:
#	server/util-server.js
2022-05-07 13:26:47 +08:00
Louis Lam 15820c6937 Update SQLite 2022-05-01 19:45:00 +08:00
Louis Lam d962ab7a1c Merge branch 'master' into uptime-badges
# Conflicts:
#	package-lock.json
#	server/routers/api-router.js
2022-05-01 17:03:11 +08:00
Louis Lam 63c8d24d6f As legacy-peer-deps is specified in .npmrc, `install-legacy` and `update-legacy` are not actually needed. 2022-05-01 12:32:06 +08:00
Louis Lam 26230a3d3a Update to 1.15.1 2022-04-29 13:52:14 +08:00
Louis Lam 752415dae6
Merge pull request #1566 from Saibamen/fix_duplicated_PR_comments
Fix duplicated PR comments
2022-04-27 15:01:52 +08:00
Aram Akhavan 39df4eea92 Ssynchronize push monitor heartbeats to api calls
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
Adam Stachowicz dcdbb7be8b Use separate job for linters 2022-04-26 01:57:49 +02:00
Adam Stachowicz b874ea8b28 Add missing lint-fix:style command 2022-04-26 01:37:20 +02:00
Adam Stachowicz 1e595eaa76 Update linters 2022-04-26 01:26:57 +02:00
Louis Lam 4114f43b48 Start both dev servers in one command 2022-04-26 02:18:14 +08:00
Louis Lam 751924b335 Update to 1.15.0 2022-04-24 22:57:42 +08:00
Jens Neuber e103ac8335 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-04-20 10:10:14 +02:00
Louis Lam 7c13b1b6cb Update to 1.15.0-beta.1 2022-04-19 20:07:18 +08:00
Louis Lam 29d2d95c71 Merge branch '1.14.X'
# Conflicts:
#	package.json
#	server/server.js
2022-04-19 16:43:13 +08:00
Louis Lam b782b25e17 Update to 1.14.1 2022-04-19 16:01:08 +08:00
Louis Lam f712fe85e5 Update node-sqlite, sqlite from 3.36 to 3.38 2022-04-18 12:44:32 +08:00
Louis Lam c28b90feb4 Update to 1.15.0-beta.0 2022-04-17 20:07:32 +08:00
Louis Lam 5fa62a888c Merge branch 'master' into mqtt2
# Conflicts:
#	server/database.js
#	server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam d71c086447 Standardize array bracket spacing 2022-04-17 15:27:35 +08:00
Louis Lam 8eb83394f7 Refine UI/UX for custom css / footer text. Add switch for show/hide powered by 2022-04-17 14:53:13 +08:00
Louis Lam 03bcf5c766 Add a simple mqtt server for testing 2022-04-17 01:07:54 +08:00
Louis Lam b1c7915bc1 Merge branch 'master' into mqtt2
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
Louis Lam 8d0446dc38 Add lint as part of test 2022-04-14 01:20:54 +08:00
Louis Lam 3436e26ed4 Fix styleline, fix css format issues globally 2022-04-14 01:20:54 +08:00
Louis Lam 1ba92d803e Update to 1.14.0 2022-04-12 14:17:13 +08:00
Louis Lam 316e65d35a Update to 1.14.0-beta.2 2022-04-10 00:46:34 +08:00
Louis Lam 8b45a95cc3 Merge branch '1.13.X'
# Conflicts:
#	package.json
2022-04-06 23:20:22 +08:00
Louis Lam 02becfd113 Update to 1.13.2 2022-04-06 22:54:03 +08:00
Louis Lam 99042e6991 Update to 1.14.0-beta.1 2022-04-03 22:06:39 +08:00
Louis Lam 4738581c66 Update dependencies 2022-04-02 11:34:00 +08:00
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
2022-04-01 14:57:35 +08:00
Louis Lam f02e9c44ec Update to 1.14.0-beta.0 2022-03-30 23:37:23 +08:00
Louis Lam b72a2d350f Set cloudflared token from env var or arg 2022-03-30 20:08:26 +08:00
Louis Lam 82ea896bbc Improve the workflow of cloudflared 2022-03-30 11:59:49 +08:00
Louis Lam f1f4b3b377 Add reverse proxy setting page for controlling cloudflared 2022-03-30 01:49:45 +08:00
Louis Lam 7d3cbff794 [Cloudflared] Install into base docker 2022-03-29 02:24:10 +08:00
Louis Lam 623d03dc6f Fix release process 2022-03-25 00:03:25 +08:00
Louis Lam f52e527850 Update to 1.13.1 2022-03-24 23:47:03 +08:00
Louis Lam 6c7a0ff7d3 Fix release script 2022-03-24 22:44:22 +08:00
Louis Lam 2abdf2efad Update to 1.13.0 2022-03-24 22:21:19 +08:00
Louis Lam 668dffc2c5 Simplify final release 2022-03-22 16:45:07 +08:00
Louis Lam 909618a29a Update to 1.13.0-beta.2 2022-03-22 14:30:54 +08:00
Louis Lam 4a4ffc96dd Fix setup 2022-03-22 12:00:13 +08:00