mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,133 Commits 17 Branches 112 Tags 60 MiB
Commit Graph

807 Commits

Author SHA1 Message Date
CoolCu b25ac55a2f
chore: fix some typos in comments (#4679) 
Signed-off-by: CoolCu <coolcui@qq.com>
 2024-04-16 16:59:07 +02:00
Frank Elsinga 0e3b3a9ab8
Made sure that more of the async usages are awaited (#4574) 2024-03-15 15:02:55 +01:00
Andi Pätzold a0c62d8ab0
Fix: handle monitor names with slashes (#4472) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-03-03 17:59:38 +08:00
Nelson Chan 56aa81e337
UI: Improve maintenace actions design (#4407) 2024-02-03 06:16:14 +08:00
Nelson Chan 2bccae415f
Feat: Show monitor ID in Details (#4331) 2024-01-28 18:15:29 +08:00
Abhishek Srinivasan 23e80882c6
Changed the color of delete button in dashboard from red to grey (#4307) 2024-01-04 00:29:38 +08:00
Frank Elsinga e2fdfd2937
Migrate all `v-html` translations to componentised translations (#4135) 
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-12-15 18:38:57 +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 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 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
Cyril59310 97ed0a96d8
Missing translation key (#4200) 2023-12-10 14:33:01 +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
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 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 cb3a104dc0
Default Retries from 1 to 0 (#4139) 
* Default "Retries" from 1 to 0
 2023-12-01 14:09:13 +08:00
Adam Hancock ac452bbcb9
Zoom in on real browser screenshot (#3925) 
* Screenshot in modal

* Update src/components/ScreenshotDialog.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/Details.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Added title

* Update ScreenshotDialog.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Add translations

---------

Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2023-11-24 02:58:33 +08:00
Louis Lam 188fdcb6ad Merge branch 'master' into 1.23.X-merge-to-2.X.X 
# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
 2023-11-13 21:25:49 +08:00
Louis Lam ace1fe00c2 Merge branch 'master' into 1.23.X-merge-to-2.X.X 
# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/uptime-kuma-server.js
#	server/util-server.js
 2023-11-13 21:15:51 +08:00
Louis Lam 8e3ff25f7b
Followup #3864, rebase for 1.23.x (#4016) 
* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead

---------

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
 2023-11-12 20:32:40 +08:00
Nelson Chan 5b6522a54e
Fix: entryPage setting can be null (#3994) 2023-11-08 20:46:10 +08:00
Nelson Chan b534fde265
Fix: Use ActionSelect for Docker Host & validate input (#3864) 
* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead
 2023-11-03 21:25:28 +08:00
Muhammed Hussein karimi 9f170a68d7
🐛 fix: boolean fields in kafka producer monitor (#3949) 
* 🐛 fix: boolean fields in kafka producer monitor

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: boolean fields db patch table modify

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* ✏️  typo: remove `_old` COLUMNs in patch-fix-kafka-producer-booleans

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

---------

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
 2023-10-28 14:42:55 +08:00
Nelson Chan 201c10416e
Fix: Entry page setting in Dev mode (#3940) 2023-10-28 10:34:15 +08:00
Louis Lam 523d137e2b Lint 2023-10-16 00:43:07 +08:00
Louis Lam 18169c59a1
[MySQL monitor] Split password into a standalone field (#3899) 2023-10-16 00:38:56 +08:00
Louis Lam 966dfa6f88
Drop backup (#3892) 
* Drop backup

* Fix warning
 2023-10-14 23:38:31 +08:00
Louis Lam 8e441dd8f7
Follow up #3263 (#3847) 2023-10-14 19:00:27 +08:00
Louis Lam 1c13a75970
Fix #3868 postgres monitor could possibly crash Uptime Kuma (#3880) 
* Bump pg

* Handle uncaughtException

* Fix parsing issue of postgres connection and fix the query example
 2023-10-13 02:50:10 +08:00
Andreas Brett 42bf27fe5a
push monitor: increase token security (#912) 
* increased pushToken security

* Merge manually

---------

Co-authored-by: Andreas Brett <github@abrett.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-10-11 19:28:06 +08:00
Louis Lam 852b3fa61b Merge branch '1.23.X' 
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/server.js
#	server/util-server.js
 2023-10-09 21:28:01 +08:00
Nelson Chan bd9c44cccf Fix: Disable status page saving before getData 2023-10-09 06:41:07 +08:00
Louis Lam 98b93c887a
Show push example under the detail page (#3739) 2023-09-25 17:49:00 +08:00
Muhammed Hussein karimi 2ab21ccf8a
🐛 fix: kafka producer bugs (#3771) 
* 🐛 fix: missing Kafka Producer SSL option in frontend object

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* ♻️  refactor: better error handling of kafka producer

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

---------

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
 2023-09-24 03:30:15 +08:00
Nelson Chan 7c49f7e5a6
Feat: Full server-side pagination for important events (#3515) 
* Feat: Serverside pagination for importantBeats

* Chore: Remove unused state

* Apply suggestions from code review

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Fix: Add watch for monitor

* Fix: Fix compatibility with dynamic page length

* Chore: Fix lint

* Merge conflict

---------

Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-09-23 19:03:45 +08:00
Louis Lam 59119b9e71 Merge branch '1.23.X' 
# Conflicts:
#	package-lock.json
 2023-09-18 03:26:59 +08:00
Nelson Chan 0d846be10e
Fix: misc. styling fixes (#3757) 2023-09-17 20:43:09 +08:00
FC (Fay) Stegerman d8a8f6c08b
EditMonitor: add missing config UI for json-query (#3751) 2023-09-17 20:39:07 +08:00
Nelson Chan 1e12ca4786
Fix: Disable save button on submit (#3729) 2023-09-16 05:11:18 +08:00
Anders Kvist f0c54be43f
Adding x-www-form-urlencoded (#3499) 
* Adding x-www-form-urlencoded

* Adding example of x-www-form-urlencoding to body.

* A bit cleaner.

* Update server/model/monitor.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/EditMonitor.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/EditMonitor.vue

Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Add simple test

---------

Co-authored-by: Anders Kvist <ak@cego.dk>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-09-09 18:05:25 +08:00
ZaneL1u 1f29fabe64
fix: fix the judgment condition of Tailscale (#3701) 2023-09-07 16:15:21 +08:00
Louis Lam 5061e42d4b Merge remote-tracking branch 'origin/2.0.X' into 2.0.X 2023-09-01 05:23:52 +08:00
Louis Lam 076331bf00
Uptime calculation improvement and 1-year uptime (#2750) 2023-09-01 05:19:21 +08:00
Louis Lam a13fc7079e Merge branch 'master' into 2.0.X 
# Conflicts:
#	package-lock.json
 2023-08-30 01:39:16 +08:00
Louis Lam cd79df07e1
Add an ability to enable/disable nscd (#3652) 2023-08-28 16:15:48 +08:00
Louis Lam 0c40f02584 Put `Monitor Group` under `Advanced` section 2023-08-28 04:59:47 +08:00
Louis Lam 31c00081fa Merge branch 'master' into 2.0.X 2023-08-16 16:14:04 +08:00