Louis Lam
81c9900e23
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# docker/debian-base.dockerfile
1 year ago
Louis Lam
57a18958d6
Update gamedig from ~4.1.0 to ^4.2.0 ( #4136 )
1 year ago
Louis Lam
1708b67949
Change execSync/spawnSync to async ( #4123 )
...
* WIP
* Add missing await
* Update package-lock.json
1 year ago
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>
1 year ago
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
1 year ago
Louis Lam
73239d441d
Update to 1.23.7
1 year ago
Louis Lam
f28dccf4e1
Merge pull request from GHSA-v4v2-8h88-65qj
1 year ago
Louis Lam
dc42420193
Change version to 2.0.0-dev
1 year ago
Louis Lam
d810a74d70
Move rootless images to an another set ( #4052 )
1 year ago
Louis Lam
92e0eec6d4
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# package.json
# server/model/monitor.js
1 year ago
Louis Lam
c1aaad0d85
Update to 1.23.6
1 year ago
Louis Lam
954e05b72f
Fix #4051
1 year ago
Louis Lam
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
1 year ago
Louis Lam
6d4a45f18c
Update to 1.23.5
1 year ago
Louis Lam
188fdcb6ad
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
1 year ago
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
1 year ago
Louis Lam
d56bf08cd7
Update to 1.23.4
1 year ago
Louis Lam
d7b9bcf4b4
Drop install.sh and related files ( #3955 )
1 year ago
Louis Lam
18169c59a1
[MySQL monitor] Split password into a standalone field ( #3899 )
1 year ago
Louis Lam
9ebf4f97bb
Add `npm run start-server-dev:watch`
1 year ago
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)
1 year ago
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
1 year ago
Louis Lam
b59054454d
Remove unused scripts
1 year ago
Louis Lam
c39043ec32
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package-lock.json
1 year ago
Louis Lam
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
1 year ago
Louis Lam
c3e3f27457
Update to 1.23.3
1 year ago
Louis Lam
99179c82d7
Drop @vitejs/plugin-legacy ( #3858 )
1 year ago
Louis Lam
66a10b8993
Pump gamedig from 4.0.X to 4.1.X and update dependencies
1 year ago
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>
1 year ago
Louis Lam
34b9fe2ffe
A small tool for rebasing pr ( #3781 )
1 year ago
Louis Lam
38bcab67f9
Rollback eslint as a breaking change, just pin the version of eslint-plugin-jsdoc to avoid error
1 year ago
Louis Lam
22f5bb1684
Update eslint
1 year ago
Louis Lam
59119b9e71
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
1 year ago
Louis Lam
b3b8e9f3a0
Update to 1.23.2
1 year ago
Louis Lam
e5345848a2
Update dependencies
1 year ago
Louis Lam
6e887b056c
Fix docker build issue in 2.0
1 year ago
Louis Lam
5061e42d4b
Merge remote-tracking branch 'origin/2.0.X' into 2.0.X
1 year ago
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
1 year ago
Louis Lam
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
1 year ago
Louis Lam
f2a1c26ef8
Update to 1.23.1
1 year ago
Louis Lam
eec221247f
Merge branch 'master' into 2.0.X
1 year ago
Louis Lam
9564550d5f
Update to 1.23.0
1 year ago
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>
1 year ago
Louis Lam
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
1 year ago
Louis Lam
de83863627
Update to 1.23.0-beta.1
1 year ago
Louis Lam
18a2a8eb1e
Update to 1.23.0-beta.0
1 year ago
Louis Lam
d231a05526
Remove babel-plugin-rewire ( #3522 )
1 year ago
Henrik Gerdes
42b5d30a33
feat: Implement oauth2 monitors ( #3119 )
...
* [empty commit] pull request for implement oauth2 monitor
* feat: implement oauth2 client credentials flow
* fix: auth methods clarification & error handling
* docs: fix JSdocs types and clarifications
1 year ago
zappityzap
eb6167aaf1
Nostr dm notifications ( #3473 )
...
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
* better websocket polyfill, update deprecated function
* add conditional polyfills for node versions
* lint
* use correct npm for package-lock
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
a0bd4b248b
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# package.json
# server/database.js
# src/router.js
1 year ago
Louis Lam
9058a829a1
Update install.sh ( #3464 )
1 year ago
Louis Lam
688f23035b
Update @louislam/ping to 0.4.4-mod.1 (Add back OpenBSD ping support)
1 year ago
Muhammed Hussein karimi
278b88a9d9
✨ feat: added kafka producer ( #3268 )
...
* ✨ feat: added kafka producer
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: eslint warn
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typings and auth problems
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better variable name to trrack disconnection
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: grouping Kafka Producer special settings into one template
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ✨ feat: add kafka producer translations into `en.json`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: disable close-on-select on kafka broker picker
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: `en.json` invalid json (conflict resolve)
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Minor
* Fix a bug of clone
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
084cf01fcd
Add support for Codespaces ( #3432 )
...
* Create devcontainer.json
* WIP
* WIP
* WIP
* Create README.md
* Try to fix cypress issue
* Add extensions
* WIP
* Minor
1 year ago
Louis Lam
25c8196641
Support Node.js 20 again ( #3431 )
...
* Support >= Node.js 20.4.0
* Improve the Node.js warning, ban 20.0 to 20.3
* Update
* Minor
1 year ago
Louis Lam
345e61abca
Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders
...
# Conflicts:
# package-lock.json
# package.json
1 year ago
Muhammed Hussein karimi
6bece8796e
✨ feat: json-query monitor added ( #3253 )
...
* ✨ feat: json-query monitor added
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: import warning error
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: br tag and remove comment
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: supporting compare string with other types
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: switch to a better lib for json query
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: result variable in error message
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typos in json query description
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: needed white space in `README.md`
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Rebuild package-lock.json
* Lint
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: zappityzap <128872140+zappityzap@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
1 year ago
Louis Lam
771d21c4ad
Update dependencies ( #3384 )
1 year ago
Louis Lam
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
1 year ago
Louis Lam
8223121cd8
Update to 1.22.1
1 year ago
Louis Lam
7c529d8f83
Check docker before build
1 year ago
Louis Lam
d286c534bd
Improve the setup database for embedded MariaDB
1 year ago
Louis Lam
16a1a66e09
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/debian-base.dockerfile
# docker/dockerfile
# package.json
# server/database.js
# server/jobs/util-worker.js
# server/model/maintenance.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/uptime-kuma-server.js
1 year ago
Nelson Chan
0e725569e5
Feat: Add placeholders for badge generator
...
Chore: Save as dev dep.
1 year ago
Louis Lam
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
Louis Lam
4b913c8b4c
Update to 1.22.0
1 year ago
Nelson Chan
97d38ee1a8
Feat: Add custom body for Webhook Notif.
1 year ago
Louis Lam
149f8c3646
Update required node version and update dependencies
1 year ago
Louis Lam
71c34694b7
Update to 1.22.0-beta.0
1 year ago
Louis Lam
2128ed5ce3
Update dependencies
1 year ago
Louis Lam
771ca09331
npm update (mainly for socket.io)
2 years ago
Nelson Chan
83a59bd984
Fix: Add password filtering
2 years ago
Nelson Chan
a27386bb92
Fix: Use croner for clear-old-data
2 years ago
Louis Lam
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
Louis Lam
1a344c1371
Update to 1.21.3
2 years ago
Louis Lam
28b0f8fc00
Update dependencies
2 years ago
Louis Lam
f433f33418
Merge remote-tracking branch 'origin/master' into update-chartjs
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
Zaid-maker
49741bbef2
🐛 fix(package.json): correct typo in deploy-demo-server script name
2 years ago
Louis Lam
03aa685d3f
Update to 1.21.2
2 years ago
Louis Lam
8f449ab738
Update to 1.21.2-beta.0
2 years ago
Louis Lam
227cec86a8
WIP
2 years ago
Louis Lam
02291730fe
WIP
2 years ago
Louis Lam
4ae437dd61
Update to 1.21.1
2 years ago
Louis Lam
6cb296b07a
Update SQLite and Vue
2 years ago
Louis Lam
72317633d9
Update to 1.21.0
2 years ago
Louis Lam
1e80365b73
Update node-ping to 0.4.4
2 years ago
Louis Lam
0efabb4e39
Update to 1.21.0-beta.1
2 years ago
Louis Lam
0dce492226
Update to 1.21.0-beta.0
2 years ago
Louis Lam
3e60912992
Update node-ping
2 years ago
Louis Lam
f17d23f5d8
A script for sorting contributors from weblate
2 years ago
Nelson Chan
beb22f743d
Chore: Update chart.js & improve perf.
2 years ago
Louis Lam
beafbf27ad
Merge pull request #2858 from louislam/1.20.X
...
Merge 1.20.x to master
2 years ago
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>
2 years ago
Louis Lam
5b0b743f81
Update to 1.20.2
2 years ago
Louis Lam
3c5f998191
Update mongodb to 4.14.0, possibly fix #2820
2 years ago
Louis Lam
fdc3b2d57a
Update to 1.20.1
2 years ago
Louis Lam
76bdb62a5b
Update to 1.20.0
2 years ago
Louis Lam
c5ff010669
Add loose dependency `qs` which is used by `aliyun-sms.js`
2 years ago
Louis Lam
f1bac7ce8a
Add a script that deploy to the demo server
2 years ago