Commit Graph

125 Commits

Author SHA1 Message Date
leonace924
ac87fa1969 feat: add rss title field and handle rss link from request 2026-01-06 00:15:53 -05:00
Frank Elsinga
d172f2fde9
Merge branch 'master' into feature/umami-analytics-status-page 2026-01-03 16:57:11 +01:00
Markus Reisenhofer
d096e2902c
feat(gamedig): Update gamedig implementation to v5 (#4949)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-03 05:56:38 +00:00
Frank Elsinga
a69566dd26
Merge branch 'master' into feature/umami-analytics-status-page 2025-12-01 02:06:52 +01:00
broodroosterdev
5c83b17992
feat: Add toggle to hide the uptime percentage on a statuspage (#4587)
Co-authored-by: Bas Wieringa <bas.wieringa@waterplatformcompany.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-11-25 00:28:42 +00:00
Frank Elsinga
79611aca3c
Merge branch 'master' into feature/umami-analytics-status-page 2025-10-27 13:16:29 +01:00
Kanwarpreet Singh
0e30c43a80
Cache Cleared (#6101) 2025-09-04 14:03:35 +02:00
yumeiyin
d490285a44
chore: fix some minor issues in comments (#5984)
Signed-off-by: yumeiyin <yin.yumei@qq.com>
2025-07-14 10:08:53 +02:00
Louis Lam
b1e8d9b4d2
[Eliminate Blocking] Push example (#5925) 2025-06-19 15:41:21 +08:00
Louis Lam
e0335ecfbd
[Eliminate Blocking] Database related (#5926) 2025-06-19 14:30:24 +08:00
Louis Lam
4962817795
[Eliminate Blocking] User related (#5928) 2025-06-19 14:29:43 +08:00
Louis Lam
dcff640248
Fix (#5875)
Co-authored-by: ptrstr <ptrstr@protonmail.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-06-04 10:04:57 +08:00
Ionys
2b3f49a266
Add a public URL field for monitors and uses it on the status page (#5435)
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2025-05-10 19:05:37 +02:00
hadestructhor
28e288db2c fix(analytics): fixed issues with db init and refactor of code and names 2025-04-10 23:48:46 +02:00
hadestructhor
e44ec55eda chore: cleanup and refactoring 2025-02-18 00:45:53 +01:00
hadestructhor
afae736972 feat: add support for umami tracking 2025-02-09 14:06:25 +01:00
Luke Thomas
cdb8ad321d
fix: slug input (#5239)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-11-26 01:56:23 +01:00
Ionys
8a432ac937
fix(status page): Make sure the group deletion is correctly handled when groupIDList is empty (#5340) 2024-11-12 19:00:09 +01:00
Louis Lam
eca90a2b00
Revert "feat: structured logging (JSON)" (#5175) 2024-10-09 07:43:44 +08:00
Cassandra
b287a25de7
feat: structured logging (JSON) (#5118) 2024-09-24 17:51:21 +08:00
Frank Elsinga
9486fa22ee
made sure that the socket handlers have consitent names (#4818) 2024-08-24 18:40:50 +02:00
Nelson Chan
a581a85633
Feat: Use UptimeCalculator for PingChart (#4264)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 22:03:32 +02:00
Laurent Aupse
e856cb6007
Make auto refresh interval customizable (#4260)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 21:56:55 +02:00
jmolnar-comparative
237a6e8da9
chore: fixed a typo for internal, unused part of the file upload icon for status page (#4750) 2024-05-10 20:35:36 +02:00
Frank Elsinga
0e3b3a9ab8
Made sure that more of the async usages are awaited (#4574) 2024-03-15 15:02:55 +01: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
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
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
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
9536c6aa6a Minor 2023-11-24 17:33:13 +08:00
Louis Lam
b689733d59 Fix getGameList, testChrome without checkLogin 2023-11-24 16:37:52 +08:00
Nelson Chan
2267655e99
Chore: Add remaining server translation keys (#3684) 2023-09-27 04:53:14 +08:00
Louis Lam
98b93c887a
Show push example under the detail page (#3739) 2023-09-25 17:49:00 +08:00
Nelson Chan
52946c3e08
Feat: Translate toast messages by adding msgi18n to callbacks (#3263)
* WIP: Add msgTranslated to callbacks

* Chore: Unify Saved period

* Feat: add support for interpolation
2023-09-01 20:51:28 +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
Tarun Singh
6f4af30701 Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry 2023-07-13 20:02:50 -04: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
Tarun Singh
4ea5771f97 Status page certificate expiry 2023-07-04 19:37:45 -04:00
Louis Lam
df8fcffb19 Drop unused code 2023-07-03 14:50:30 +08:00
Louis Lam
4f6035899d
Real browser monitor type (#3308) 2023-06-27 15:54:33 +08:00
Peace
9bd76c2795
Merge branch 'master' into group-monitors 2023-05-31 20:51:33 +02:00
Louis Lam
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
Feat: Support auto theme in status pages
2023-04-03 02:38:30 +08:00
Louis Lam
227cec86a8 WIP 2023-03-31 20:25:37 +08:00
Louis Lam
02291730fe WIP 2023-03-31 04:04:17 +08:00
Nelson Chan
150607cc93 Feat: Support auto theme in status pages 2023-03-02 07:26:26 +08:00
Matthew Nickson
669f8700b2
Switched to nanoid for key generation
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-26 19:36:50 +00:00
Matthew Nickson
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key 2023-02-26 16:47:45 +00:00
Matthew Nickson
42a69c16ca
Switched to crypto.randomBytes fpr key generation
Keys are now 32 bytes long encoded in a URL safe base64 string

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-26 16:47:34 +00:00
Louis Lam
ef64077980 Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
# Conflicts:
#	src/lang/en.json
2023-02-25 00:06:25 +08:00
Nelson Chan
c65a920050 Chore: Fix code comment 2023-02-24 21:09:55 +08:00