Commit Graph

187 Commits

Author SHA1 Message Date
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 8d8c38b1a8 Allow unused vars in args and fix more eslint issues 2022-04-17 01:39:49 +08:00
Louis Lam 03bcf5c766 Add a simple mqtt server for testing 2022-04-17 01:07:54 +08:00
Louis Lam 649f3106e1 Enforce semicolon, fix format globally 2022-04-14 01:20:54 +08:00
Louis Lam 772d009f43 Merge branch 'master' into fluencydoc_master
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
2022-04-12 17:44:04 +08:00
Louis Lam 2e50ef0e8f
Merge pull request #1450 from AnnAngela/1.14.0-zh_cn
1.14.0 translation improvement
2022-04-09 14:40:38 +08:00
Louis Lam 7bbaeffd3e Fix reset-password (issue caused by 5027fcd320) 2022-04-08 00:56:56 +08:00
AnnAngela 511b9dd425
Update fs-rmSync.js 2022-04-06 10:31:01 +08:00
AnnAngela e9dd64b6f0
Update comments of fs-rmSync.js 2022-04-06 10:20:57 +08:00
Louis Lam f54084c888 Update beta release process 2022-04-03 22:06:36 +08:00
Louis Lam 87d3853b8e
Merge pull request #1348 from AnnAngela/master
Detect if `fs.rmSync` is available to avoid the runtime deprecation warning
2022-04-02 18:21:12 +08:00
Louis Lam 7d3cbff794 [Cloudflared] Install into base docker 2022-03-29 02:24:10 +08:00
AnnAngela 7fd5b61bab
Inproperly conflict resolving 2022-03-27 21:12:51 +08:00
AnnAngela 96289fe014
Update index.js 2022-03-27 20:56:42 +08:00
AnnAngela 381605aca1
Update update-version.js 2022-03-27 20:55:28 +08:00
AnnAngela 742c6bcaa3
Merge branch 'master' into master 2022-03-27 20:54:24 +08:00
Louis Lam 623d03dc6f Fix release process 2022-03-25 00:03:25 +08:00
Louis Lam 6c7a0ff7d3 Fix release script 2022-03-24 22:44:22 +08:00
Louis Lam 7fb16d2f9a Limit the pm2 log size 2022-03-23 11:17:23 +08:00
Louis Lam 668dffc2c5 Simplify final release 2022-03-22 16:45:07 +08:00
Louis Lam 76f991ecd8 Update beta process 2022-03-22 11:30:45 +08:00
Louis Lam 58ee071fae Release process for beta 2022-03-21 14:31:29 +08:00
Louis Lam 4e95e9ea51 Add process for beta release 2022-03-20 11:08:33 +08:00
AnnAngela 88a798704b
Update fs-rmSync.js 2022-03-02 16:10:14 +08:00
AnnAngela-work 783173fd1f Add a helper function 2022-03-02 15:48:08 +08:00
Louis ed64853125 Keep FBSD, BSD for ping only 2022-01-12 01:44:01 +08:00
Denis 6bda5c6329 update comment 2022-01-11 13:39:45 +01:00
Louis f9751d0c01 Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236 2022-01-11 19:15:28 +08:00
Louis Lam 7cfc5c64b7
Missing a full stop 2021-12-22 13:49:57 +08:00
Louis Lam 5ee5ea909d Add Github Action: close-incorrect-issue.yml 2021-12-11 20:59:31 +08:00
Fluency e3745da986
Merge branch 'master' into master 2021-11-23 10:26:45 -08:00
Fluency 7179c6cc4c
Fix punctuation in extra/update-version.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-19 10:30:31 -08:00
Louis Lam 5d3bf68123 add remove-2fa command 2021-11-18 18:22:03 +08:00
Calum Bird f55350bebc Generated documentation :) 2021-11-09 21:24:31 -08:00
Louis Lam e496c3b3be update healthcheck.js 2021-11-02 22:03:02 +08:00
Louis Lam 60e12f4bfa fix healthcheck.js with prefix UPTIME_KUMA_ 2021-11-02 01:13:05 +08:00
Louis Lam a5f15f2319 Fix #793, check dist-backup existing before delete 2021-10-25 12:29:40 +08:00
Louis Lam 6944b35ea7
Merge pull request #667 from zsxeee/i18n
Missing i18n and zh-CN translation
2021-10-16 22:47:58 +08:00
Louis Lam bc3e3f9118 [test] update 2021-10-16 13:02:04 +08:00
Louis Lam 4d26825cbe [test] reset-password 2021-10-16 01:33:44 +08:00
zsxeee a2cc7d1db9
Avoid directory not found error 2021-10-12 15:10:32 +08:00
Louis d9eab90a69 Merge branch 'no-need-build'
# Conflicts:
#	.dockerignore
#	.gitignore
2021-10-10 16:34:13 +08:00
LouisLam 22227be408 update version in wiki too 2021-10-06 02:06:59 +08:00
LouisLam 2625cbe0d2 add script for downloading the dist files from github 2021-10-02 14:43:31 +08:00
LouisLam c93f42794f upload prebuilt dist to github release 2021-10-02 01:48:15 +08:00
LouisLam 87a4748b40 check back to root user for Debian, until problem has been found (#488) 2021-09-29 12:40:28 +08:00
LouisLam b0e9c5bcb4 fix reset-password (#448) 2021-09-20 16:29:18 +08:00
LouisLam f0ac3c82d2 add some comments 2021-09-19 00:51:05 +08:00
Michal Ciania 7f78cc8d0f Substitute default values only once 2021-09-18 11:33:25 +02:00
Michal Ciania 9eaa4ab846 Docker entrypoint for running the application as non-root user 2021-09-17 22:57:27 +02:00
Adam Stachowicz a34b2623c8 Remove double spaces in `console.log` output with multiple parameters 2021-09-15 20:57:46 +02:00
Adam Stachowicz 79920b5f2c Fix languages after 80322cbfe7
Fix ESLint deprecated warning. Update `README.md` for  languages. Update `update-language-files` script
2021-09-15 20:52:39 +02:00
LouisLam 201bba63d7 add a healthcheck comment 2021-09-10 21:17:20 +08:00
LouisLam 1d05df6ec9 [docker healthcheck] use retries instead, longer start-period causes starting problem in Docker Swarm mode 2021-09-09 11:41:28 +08:00
Louis Lam 926c15ea40
Update healthcheck.js 2021-09-07 17:30:50 +08:00
LouisLam ec8c1cad31 update healthcheck.js for changing ssl cert / hostname / port 2021-09-07 16:06:28 +08:00
LouisLam 4b8e7fcffc update "build-docker" to build both platforms 2021-09-04 15:03:26 +08:00
LouisLam c7e6cb9f37 update language files 2021-09-01 20:10:54 +08:00
LouisLam 923d325b44 add language file preparation script 2021-09-01 17:10:12 +08:00
LouisLam ad38e61c26 add language file preparation script 2021-09-01 17:08:27 +08:00
LouisLam bc70ecfba7 fix install script 2021-09-01 14:56:19 +08:00
Louis Lam 7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
Added DNS Monitor Type
2021-08-28 00:21:10 +08:00
LouisLam 03b4086372 add CAA test and remove some files added by mistake 2021-08-27 23:57:42 +08:00
Ponkhy acd5cf63fd Removed wrong PTR answer 2021-08-27 17:41:22 +02:00
Ponkhy 177af2d588 Added more dns types to simple-dns-server 2021-08-27 17:32:50 +02:00
LouisLam c55f2b93f7 change to pm2 start server/server.js directly due to (#273) 2021-08-26 22:55:44 +08:00
LouisLam 8318c2e8ff add a simple dns server for testing, and disable ipRegex for dev only (need to input port) 2021-08-26 01:50:27 +08:00
LouisLam 49ba5fb1b2 update to 1.3.1 2021-08-22 02:13:00 +08:00
LouisLam 8f5e5ad944 install.sh - check docker is running 2021-08-19 12:47:11 +08:00
LouisLam 575c3ee182 install.sh - check docker is running 2021-08-19 12:39:51 +08:00
LouisLam c9aa110f6c install.sh - check docker is running 2021-08-19 12:15:07 +08:00
LouisLam bb0af35d47 wip: implementing install script 2021-08-19 02:38:45 +08:00
LouisLam 61944d642e wip: implementing install script 2021-08-19 02:04:49 +08:00
LouisLam 269ac2410b install.sh add supports for CentOS 2021-08-18 14:55:03 +08:00
LouisLam d218661f3d wip: implementing install script 2021-08-17 23:08:35 +08:00
LouisLam 365ea0a189 add batsh 2021-08-11 14:52:25 +08:00
LouisLam bf33f97c9e code re-use and eslint 2021-08-09 13:49:37 +08:00
LouisLam d0aad3400c add reset password in cli 2021-08-09 13:34:44 +08:00
LouisLam d315e8306b update to 1.0.10 2021-08-04 13:59:42 +08:00
LouisLam 8cd0e7a058 a better script for version update 2021-08-04 13:53:21 +08:00
LouisLam 8fce62632d a better script for version update 2021-08-04 13:53:13 +08:00
Adam Stachowicz 1d45a7606d Fix Docker build 2021-07-18 13:51:44 +02:00
Niyas c203317b3b
Docker healthcheck
Copied from https://scoutapm.com/blog/how-to-use-docker-healthcheck
2021-07-17 20:07:35 +05:30
LouisLam f62b70c9a9 add nightly to version number 2021-07-17 02:30:16 +08:00
LouisLam c81930cacc add build-docker-nightly script 2021-07-13 23:03:55 +08:00
LouisLam 6d4694da43 add version-global-replace.js 2021-07-13 22:58:30 +08:00