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
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
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
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
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
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
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
afaa7bb2f0
Do not process debug log for production
2023-11-24 16:03:35 +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
Rakibul Yeasin
e2782810cf
fix: Clickable link monitors aren't underlined when editing status page ( #3820 )
2023-11-20 14:45:34 +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
Louis Lam
df832f15fe
Add Uzbek language ( #3959 )
...
* Add uz
* Update i18n.js
2023-10-30 09:23:47 +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
atmaniak
9b599ccd1d
Add Grafana Oncall notification provider ( #2783 )
...
* Add Grafana Oncall notification provider
* Fix linter errors
* Remove useless variables
* Remove test message
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* spelling consistency
* Update server/notification-providers/grafana-oncall.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/notification-providers/grafana-oncall.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* eslint requirements
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Add Grafana Oncall translation
* Update src/components/notifications/GrafanaOncall.vue
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Check empty url
---------
Co-authored-by: Emmanuel Cohen <emmanuel.cohen@bso.co>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-10-19 19:32:42 +08:00
Frank Elsinga
1515f4e121
chore:Webhook custom documentation ( #3636 )
...
* improved the documentation
* fixed the `customBodyPlaceholder` not being translated
* fixed required not being set where necessary
* changed the docs that `monitorJSON` is also avalibale for cert-expiry
2023-10-16 22:24:47 +08:00
Frank Elsinga
3fcb7bf181
Feature: SMTP-templating of customBody
and customHeader
via liquidjs ( #3414 )
...
* replaced the regex replacement engine with `Liquid`
* added custom bodys
* fixed a typo
* formatting fixes
* switched all template-variables to be camelCase
2023-10-16 22:16:49 +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
579d7232c9
Translate login error
2023-10-15 01:35:27 +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
a362206fab
Fix: do not colorize non-string log message
2023-10-14 17:48:41 +08:00
Nelson Chan
f6bdaacbba
Fix: Clear toasts button blocked by bottom bar ( #3863 )
...
* Fix: Clear toasts button blocked
* Chore: Fix lint
2023-10-14 16:52:38 +08:00
Louis Lam
03e43ab364
Log color and simplify startup log for production ( #3889 )
2023-10-14 03:00:34 +08:00
Louis Lam
7212d884ef
Enable eslint for util.ts ( #3887 )
...
* Enable eslint for util.ts
* Drop babel (since eslint parser was replaced by typescript-parser and it doesn't seem to be used anywhere)
* Apply "plugin:@typescript-eslint/recommended"
* Minor
* Remove comment for generated file (Keep the first comment only)
2023-10-13 22:42:45 +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
simonghpub
4e401faefb
Translated using Weblate (Danish)
...
Currently translated at 71.5% (601 of 840 strings)
Translated using Weblate (Danish)
Currently translated at 70.8% (595 of 840 strings)
Translated using Weblate (Danish)
Currently translated at 70.8% (595 of 840 strings)
Co-authored-by: simonghpub <simonpmt@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/da/
Translation: Uptime Kuma/Uptime Kuma
2023-10-11 11:28:16 +00:00
Andrea Biasi
53710b5f26
Translated using Weblate (Italian)
...
Currently translated at 70.2% (590 of 840 strings)
Co-authored-by: Andrea Biasi <andrea.biasi@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/it/
Translation: Uptime Kuma/Uptime Kuma
2023-10-11 11:28:16 +00:00
Muhammad Ari Al Ghifari
07a7233e6c
Translated using Weblate (Indonesian)
...
Currently translated at 90.9% (764 of 840 strings)
Co-authored-by: Muhammad Ari Al Ghifari <ari@alfari.id>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/id/
Translation: Uptime Kuma/Uptime Kuma
2023-10-11 11:28:16 +00:00
Dim
d7797b8086
Translated using Weblate (French)
...
Currently translated at 100.0% (840 of 840 strings)
Translated using Weblate (French)
Currently translated at 100.0% (823 of 823 strings)
Co-authored-by: Dim <DimitriDR@users.noreply.weblate.kuma.pet>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/
Translation: Uptime Kuma/Uptime Kuma
2023-10-11 11:28:16 +00:00
Nelson Chan
e9efbaa1df
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 91.8% (756 of 823 strings)
Translated using Weblate (Chinese (Traditional, Hong Kong))
Currently translated at 87.9% (724 of 823 strings)
Translated using Weblate (English)
Currently translated at 100.0% (823 of 823 strings)
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/en/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant/
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/zh_Hant_HK/
Translation: Uptime Kuma/Uptime Kuma
2023-10-11 11:28:16 +00:00
Jesper
e0ffdb8371
Translated using Weblate (Swedish)
...
Currently translated at 45.3% (373 of 823 strings)
Co-authored-by: Jesper <jesper.bjorkbrant@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/sv/
Translation: Uptime Kuma/Uptime Kuma
2023-10-11 11:28:16 +00:00