ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 16:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
4895 commits 30 branches 115 tags 66 MiB
Commit graph

169 commits

Author SHA1 Message Date
Louis Lam
869ee8ec50 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X 
# Conflicts:
#	.github/workflows/auto-test.yml
#	extra/reset-password.js
#	package-lock.json
#	package.json
#	server/routers/status-page-router.js
#	server/server.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
#	src/components/ActionInput.vue
#	src/util.js
#	src/util.ts
 2023-12-11 02:13:47 +08:00
Louis Lam
482049c72b
Merge pull request from GHSA-88j4-pcx8-q4q3 
* WIP, still need to handle npm run reset-password

* Implement it for "npm run reset-password"

Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js

* Minor
 2023-12-10 20:40:40 +08:00
Duvergier Claude
478403ef63
Adding a way to reset the admin password via CLI without any user interaction (#3912) 
* feat(cli): Allow unattended password reset via CLI

This commit adds a way to reset the admin password via CLI without any
user interaction (unattended operation).

It adds an optional `new_password` CLI argument that, when present is
used instead of prompting the user for password and password
confirmation.

It also makes sure the user is informed the password could leak into
it's shell history (it's up to him to do some cleaning if
needed/wanted).

* Change to dash style

* Add dry-run

* Fix number password issue

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-12-05 04:23:42 +08:00
Ikko Eltociear Ashimine
2ad8af9d14
Minor (#4104) 
infomation -> information
 2023-11-25 22:08:21 +08:00
Louis Lam
e9bf02fc2c Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
 2023-11-25 03:25:03 +08:00
Louis Lam
4ceeb304f1 Add a script to prepare a changelog 2023-11-24 18:44:54 +08:00
Louis Lam
d7b9bcf4b4
Drop install.sh and related files (#3955) 2023-10-29 15:28:47 +08:00
Adam Stachowicz
04b8681cfb
Fix few markdownlint warnings (#3825) 2023-10-03 05:48:21 +08:00
Louis Lam
98b93c887a
Show push example under the detail page (#3739) 2023-09-25 17:49:00 +08:00
Louis Lam
8c24b02fce Fix rebase-pr.js 2023-09-21 19:54:52 +08:00
Louis Lam
34b9fe2ffe
A small tool for rebasing pr (#3781) 2023-09-21 19:38:51 +08:00
Louis Lam
9ef1e69ae0
Push Examples (#3735) 2023-09-13 20:03:12 +08:00
Louis Lam
38f5f16dc7 [exe] Remove Costura.Fody 2023-09-01 16:29:05 +08:00
Jean-Paul van Houten - Bos
fd90828914
Added option to use --intranet to not download or update any files,… (#3350) 
* Added option to use `--intranet` to not download or update any files, this can only be done after an initial run.

* Dropped some unneeded debug changes that I commited by accident

* Added conventional suggestions from Github.com comments

---------

Co-authored-by: Jean-Paul van Houten - Bos <jeanpaul.vhouten@koop.overheid.nl>
 2023-09-01 16:20:00 +08:00
Louis Lam
a13fc7079e Merge branch 'master' into 2.0.X 
# Conflicts:
#	package-lock.json
 2023-08-30 01:39:16 +08:00
Frank Elsinga
8945316ce6
added helptexs to the installation script (#3603) 2023-08-20 03:01:37 +08:00
Matthew Nickson
8a92054c2b
Added JSDoc to ESLint (#3529) 
* Added JSDoc to eslint rules

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Fixed JSDoc eslint errors

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Update the check-linters workflow to Node.js 20

---------

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-08-11 15:46:41 +08:00
Louis Lam
a0bd4b248b Merge remote-tracking branch 'origin/master' into 2.0.X 
# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	package.json
#	server/database.js
#	src/router.js
 2023-07-30 19:15:09 +08:00
Louis Lam
9058a829a1
Update install.sh (#3464) 2023-07-21 16:09:35 +08:00
Louis Lam
13ae878ee8
Merge pull request #3347 from louislam/1.22.X 
1.22.x merge to master
 2023-07-05 11:35:36 +08:00
Louis Lam
7c529d8f83 Check docker before build 2023-07-03 20:30:21 +08:00
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
Louis Lam
a12e7eba72 [exe] Try to deal with the false positive issue (#3143) 
* [exe] Add more assembly info
 2023-06-28 14:52:53 +08:00
Trenton Holmes
ba82abe5f3 Updates the install of cloudflared to utilize the Cloudflare Package Repository 2023-04-24 06:47:44 -07:00
Louis Lam
1973db28bf minor 2023-03-20 18:02:31 +08:00
Louis Lam
61506b1af2 [Deploy to demo] No need to restart demo-kuma 2023-03-15 15:06:53 +08:00
Louis Lam
f17d23f5d8 A script for sorting contributors from weblate 2023-03-04 21:03:46 +08:00
Louis Lam
fc8a324f41 [exe] single instance only 2023-02-27 18:52:19 +08:00
Louis Lam
bba8c6fe4e [exe] Open menu item is clickable after the server is ready 2023-02-27 18:48:11 +08:00
Louis Lam
fee8fd9320 [exe] Use Environment.CurrentDirectory instead of overriding fs 2023-02-27 18:45:54 +08:00
Louis Lam
b91c526d2e [exe] Show server status 2023-02-26 17:56:01 +08:00
Louis Lam
2c62d197a0 [exe] Update dependencies 2023-02-21 16:03:41 +08:00
Louis Lam
02ddb58686 Fix cwd issues 2023-02-21 15:16:54 +08:00
Louis Lam
0e38391454 Fix dpi issue using app.manifest 2023-02-21 03:11:29 +08:00
Louis Lam
22902139d2 Implement update 2023-02-21 02:50:25 +08:00
Louis Lam
4642f9be0a Fix download-dist.js do not exit sometimes 2023-02-20 23:15:49 +08:00
Louis Lam
cf32b8bc64 Read latest version from website and add Run when system starts 2023-02-20 20:26:53 +08:00
Louis Lam
6a98ffe2f6 Merge remote-tracking branch 'origin/master' into exe 
# Conflicts:
#	.dockerignore
#	.gitignore
 2023-02-20 18:28:35 +08:00
Louis Lam
e04a8203dc Fix npm issue for deploy script 2023-02-15 03:20:40 +08:00
Louis Lam
c19dcdba44 Add reminder to keep healthcheck.js 2023-02-14 12:31:29 +08:00
Louis Lam
6048bc5dfc Revert #2083's change of healthcheck.js 2023-02-14 00:46:22 +08:00
Louis Lam
5bf00fbe0b Fix deploy-demo-server.js do not download the dist 2023-02-13 17:40:25 +08:00
Louis Lam
f1bac7ce8a Add a script that deploy to the demo server 2023-02-13 16:26:45 +08:00
Louis Lam
e4183ee2b7
Database Setup Page (#2738) 
* WIP

* WIP: Database setup process

* Add database setup page
 2023-02-11 14:41:02 +08:00
Louis Lam
33d9c1bbb1 Merge branch 'true-rootless' into mariadb 
# Conflicts:
#	docker/dockerfile
 2023-02-04 18:40:39 +08:00
Louis Lam
d39508a007 Change nightly version format 2023-02-03 13:19:51 +08:00
Louis Lam
4fb43034cd Handle k8s in healthcheck.go 2023-01-30 21:46:27 +08:00
Louis Lam
18ae6fa6c1 Merge remote-tracking branch 'origin/master' into patch-1_k8s 2023-01-30 21:34:45 +08:00
401Unauthorized
ea83af3404
clean up codes 2023-01-24 16:00:51 +08:00
401Unauthorized
912686a299
Merge from upstream 2023-01-24 15:16:59 +08:00