63a380326d
Merge branch '1.23.X' into 1.23.13-to-2.0.0
...
# Conflicts:
# .github/workflows/auto-test.yml
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/monitor-types/real-browser-monitor-type.js
# server/util-server.js
# test/cypress/unit/i18n.spec.js
2 weeks ago
bab427f715
Add `loginRequired` SocketIO event ( #4636 )
2 weeks ago
7a9e2f5de6
Merge pull request from GHSA-23q2-5gf8-gjpp
3 weeks ago
975761b448
made sure to use `Promise.allSettled` instead of sleeping for 500ms after login ( #4592 )
2 months ago
0e3b3a9ab8
Made sure that more of the async usages are awaited ( #4574 )
2 months ago
89158be7de
Merge branch 'master' into monitor_async_start_stop
3 months ago
9356e7dd4f
Update clear stats ( #4324 )
4 months ago
c9fe6b5d01
Feat: Refresh login token for the client initiating password change ( #4214 )
5 months ago
996ff28ed9
Playwright + Native Node Test Runner ( #3893 )
5 months ago
1a47563eb8
Merge branch '1.23.X' into version-merge
...
# Conflicts:
# package-lock.json
# package.json
# server/server.js
# server/uptime-kuma-server.js
5 months ago
f861a48dfc
Smoothing the update for origin check ( #4216 )
5 months ago
fa1214ae5e
Rebse #4213 ( #4215 )
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
5 months ago
99adac3eb9
Fix: typo for `disconnectAllSocketClients` ( #4213 )
5 months ago
719ef856e8
Merge manually
5 months ago
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
5 months ago
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
5 months ago
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
5 months ago
2815cc73cf
Merge pull request from GHSA-mj22-23ff-2hrr
...
* WIP
* WIP
* Handle parsing error
* Fix matching origin issue
5 months ago
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>
5 months ago
c5d9c54a04
Merge branch 'master' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package.json
5 months ago
81c9900e23
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# docker/debian-base.dockerfile
5 months ago
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.
5 months ago
1708b67949
Change execSync/spawnSync to async ( #4123 )
...
* WIP
* Add missing await
* Update package-lock.json
5 months ago
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
6 months ago
9964b6c4d8
Fix: Update monitor object on pause ( #4032 )
6 months ago
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
6 months ago
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>
6 months ago
1a862e47ab
Check if the password changed when user is not null
7 months ago
87b2e45fbf
Check if the password changed when user is not null
7 months ago
966dfa6f88
Drop backup ( #3892 )
...
* Drop backup
* Fix warning
7 months ago
03e43ab364
Log color and simplify startup log for production ( #3889 )
7 months ago
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
7 months ago
aa676150eb
Fix shutdown issue and tidy up
7 months ago
67d0ef571d
🐛 fix: lint warnings & errors ( #3862 )
...
* fix: lint warnings & errors
* fix: lint warning
* fix: lint warnings
* Update user.js
* Update util-server.js
* Update server/util-server.js
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
* Update server/model/user.js
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
---------
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
7 months ago
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
7 months ago
88afab6571
Merge pull request from GHSA-g9v2-wqcj-j99g
...
* Fix attempt
* Update message
7 months ago
2267655e99
Chore: Add remaining server translation keys ( #3684 )
7 months ago
98b93c887a
Show push example under the detail page ( #3739 )
7 months ago
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>
8 months ago
59119b9e71
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
8 months ago
33804d8823
fix: respect the user defined oauth2 auth method ( #3727 )
8 months ago
0af4ee6c34
Fix: Missing await for isActive ( #3717 )
8 months ago
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>
8 months ago
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
8 months ago
5061e42d4b
Merge remote-tracking branch 'origin/2.0.X' into 2.0.X
8 months ago
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
8 months ago
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
8 months ago
cd79df07e1
Add an ability to enable/disable nscd ( #3652 )
8 months ago
db42c13e05
Fix: Remove legacy unused tags cleanup ( #3651 )
8 months ago
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>
9 months ago
Louis Lam
BigBoot
Frank Elsinga
Nelson Chan
Adam Hancock
Muhammed Hussein karimi
DevMirza
Henrik Gerdes
Anders Kvist
Matthew Nickson