7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-10-31 19:39:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,556 Commits 13 Branches 125 Tags
ca094296f27a41d22af9cd846dc4e32e8bc5071b
Commit Graph

5556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Louis Lam
1a47563eb8 Merge branch '1.23.X' into version-merge 
# Conflicts:
#	package-lock.json
#	package.json
#	server/server.js
#	server/uptime-kuma-server.js
 2023-12-13 01:54:08 +08:00
Nelson Chan
4185ec20b0 Fix: Origin undefined on error handling (#4224) 2023-12-13 01:35:39 +08:00
Louis Lam
4245ea86e7 Update to 1.23.10 1.23.10 2023-12-13 00:55:58 +08:00
Louis Lam
f861a48dfc Smoothing the update for origin check (#4216) 2023-12-12 16:23:41 +08:00
Louis Lam
fa1214ae5e Rebse #4213 (#4215) 
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
 2023-12-11 19:30:01 +08:00
Nelson Chan
99adac3eb9 Fix: typo for disconnectAllSocketClients (#4213) 2023-12-11 19:26:20 +08:00
Nelson Chan
89beb5f264 Fix: Handle trailing slash for status page routing (#4185) 
* Fix: Handle trailing slash

* Chore: Add desc for default slug

* Chore: Use margin instead of space

* Minor
 2023-12-11 03:05:13 +08:00
Louis Lam
65e57e5621 Merge pull request #4208 from louislam/1.23.X-merge-to-2.X.X 
1.23.9 changes merge to master
 2023-12-11 02:40:12 +08:00
Louis Lam
719ef856e8 Merge manually 2023-12-11 02:36:08 +08:00
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
530c8e5328 Drop cacheable-lookup (#4178) 
* WIP

* WIP
 2023-12-11 02:01:56 +08:00
Louis Lam
621419e434 Update to 1.23.9 1.23.9 2023-12-10 20:43:29 +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
Louis Lam
2815cc73cf Merge pull request from GHSA-mj22-23ff-2hrr 
* WIP

* WIP

* Handle parsing error

* Fix matching origin issue
 2023-12-10 20:39:43 +08:00
Cyril59310
97ed0a96d8 Missing translation key (#4200) 2023-12-10 14:33:01 +08:00
Louis Lam
e1147c06aa Update denpendecies 2023-12-10 02:45:42 +08:00
Ritik Singh
abc8f2b131 Fix: Correct Maintenance Start/End Time Input to Use Explicitly Specified Timezone (#4186) 2023-12-09 18:27:07 +08:00
Nelson Chan
46b300808d Chore: Fix console colors & add JSDoc (#4170) 2023-12-09 17:48:25 +08:00
Frank Elsinga
777ef6bc7b chore: added a helptext for ntfy's priority field (#4175) 
* added a helptext for `ntfy`'s `priority` field

* linting fixes

* removed an unnecessary `Math.max` call
 2023-12-09 17:37:33 +08:00
Louis Lam
b244e8fcbb Re-export the icon on vectr.com, so it can be editable again. The current icon.svg was reduced size by a contributor previously, but the border is detached after that, which cannot edit by any svg editor anymore. 2023-12-09 04:24:19 +08:00
Louis Lam
ad4629cb03 Fix UPTIME_KUMA_DB_NAME issue (#4169) 2023-12-05 05:16:55 +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
Nelson Chan
81b84a3c53 Fix: Filtering works with group monitors (again) (#3685) 
* Fix: Group monitors use nested filtering

* Chore: Fix lint
 2023-12-05 04:04:54 +08:00
Frank Elsinga
031947319a Add an aria-label to the monitor search box (#4163) 
* added the `Search monitored sites` label

* rebase
 2023-12-05 01:15:28 +08:00
Adam Stachowicz
74a908a069 Max ESLint warnings 0 (#4158) 
* Fix ESLint warnings. Update workflows. 0 ESLint warnings for auto-test

* json-yaml-validate: Fix `unable to find version `v2``
 2023-12-04 18:19:18 +08:00
Louis Lam
20a68a16f5 Update CONTRIBUTING.md 2023-12-04 02:32:11 +08:00
Louis Lam
8aa497fb89 Update actions/stale from v7 to v8 and disable it for pull request 2023-12-04 02:11:52 +08:00
Frank Elsinga
9c56c9b346 Fixed the buttons of ActionsSelect and ActionsInput having a default type="submit" (#4162) 
* fixed the buttons having a default type="submit"

* fixed linting issue
 2023-12-04 01:15:40 +08:00
DevMirza
db7a92a74c 🐛 fix(remote-browser): Remove unused test() function (#4155) 
* fix

* fix lint

* Update Notifications.vue

* Update ActionInput.vue
 2023-12-03 20:27:09 +08:00
Nelson Chan
46432618e1 Feat: Add json-query to MQTT monitor type (#3857) 
* Feat: Add json-query MQTT monitor type

* Fix: Allow result to be null

* Fix: Remove unused parameter

* Chore: Update JSDoc

* Fix: Add default if checkType is not set

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-12-03 01:36:19 +08:00
Nelson Chan
35479c7690 Fix: Disable timezone conversion for mariadb (#3756) 2023-12-03 01:34:26 +08:00
Louis Lam
7772a546db Merge 1.23.8 (#4142) 
1.23.x merge to master
 2023-12-02 18:47:26 +08:00
Louis Lam
c3260bbf51 Merge lock file 2023-12-02 18:43:41 +08:00
Louis Lam
c5d9c54a04 Merge branch 'master' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	package.json
 2023-12-02 18:43:06 +08:00
Louis Lam
0110c4d57a Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	package-lock.json
#	package.json
 2023-12-02 18:42:40 +08:00
Louis Lam
37666bf35f Update to 1.23.8 1.23.8 2023-12-02 17:51:06 +08:00
Louis Lam
90badfabee Update dependencies 2023-12-02 15:41:59 +08:00
Louis Lam
81c9900e23 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	docker/debian-base.dockerfile
 2023-12-01 15:50:35 +08:00
Adam Hancock
62780001f7 Feature: remote browser support (#3904) 
* [empty commit] pull request for remote browser support

* Remote browser: Added UI screens and DB tables.

* Remote browser working

* Fixing tests

* Fix tests

* Fix tests

* fix tests

* Test browser

* revert init_db.js

* Changed drop down to ActionSelect

* Fix translations

* added remote browsers toggle

* revert changes package-lock

* Fix bad english

* Set default remote browser

* Remote browsers Requested changes

* fixed description.
 2023-12-01 15:29:10 +08:00
Frank Elsinga
e3396251a8 accessible domain selector (#4133) 
* made the status domain selector more accessible

* linting fix

* implemented the suggested changes

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-12-01 15:05:01 +08:00
Frank Elsinga
9c9a086788 accessible ActionSelect/ ActionInput (#4132) 
* made sure that the ActionSelect'or has correct accessibiltiy tags

* fixed linting error

* improved the ActionInputs accessibility
 2023-12-01 14:34:37 +08:00
Louis Lam
9fb95fe95e Add support for /snap/bin/chromium (#4141) 2023-12-01 14:25:41 +08:00
Louis Lam
1e75d81bcf Update apprise from 1.4.5 to 1.6.0 (#4140) 2023-12-01 14:16:35 +08:00
Louis Lam
cb3a104dc0 Default Retries from 1 to 0 (#4139) 
* Default "Retries" from 1 to 0
 2023-12-01 14:09:13 +08:00
Louis Lam
57a18958d6 Update gamedig from ~4.1.0 to ^4.2.0 (#4136) 2023-12-01 11:42:31 +08:00
Louis Lam
0294118cbf Update README.md 2023-11-30 20:37:07 +08:00
Louis Lam
1708b67949 Change execSync/spawnSync to async (#4123) 
* WIP

* Add missing await

* Update package-lock.json
 2023-11-30 16:12:04 +08:00
Nenad Gal
01855e0ffe monitor path as a notification title mattermost (#3801) 2023-11-30 15:58:01 +08:00
dakriy
80efe9b831 Handle cookies on redirection (#3589) 
* feat: Set and send cookies on redirection (louislam#3587).

* feat: Make proxy agents handle cookies

* Merge package-lock.json

* Merge package-lock.json

* Fix lint

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-11-29 17:25:33 +08:00
Nelson Chan
b8bd17ddbd Fix: Add timeout to testDockerHost (#4097) 2023-11-26 18:47:56 +08:00