92e0eec6d4
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# package.json
# server/model/monitor.js
2023-11-20 14:49:45 +08:00
c1aaad0d85
Update to 1.23.6
2023-11-18 11:37:14 +08:00
954e05b72f
Fix #4051
2023-11-18 11:33:34 +08:00
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
2023-11-18 01:37:30 +08:00
6d4a45f18c
Update to 1.23.5
2023-11-18 01:23:53 +08:00
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
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
d56bf08cd7
Update to 1.23.4
2023-11-13 15:23:32 +08:00
d7b9bcf4b4
Drop install.sh and related files ( #3955 )
2023-10-29 15:28:47 +08:00
18169c59a1
[MySQL monitor] Split password into a standalone field ( #3899 )
2023-10-16 00:38:56 +08:00
9ebf4f97bb
Add `npm run start-server-dev:watch`
2023-10-14 17:50:54 +08:00
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
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
b59054454d
Remove unused scripts
2023-10-09 21:37:16 +08:00
c39043ec32
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package-lock.json
2023-10-09 21:36:04 +08:00
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
c3e3f27457
Update to 1.23.3
2023-10-09 20:26:18 +08:00
99179c82d7
Drop @vitejs/plugin-legacy ( #3858 )
2023-10-09 01:20:37 +08:00
66a10b8993
Pump gamedig from 4.0.X to 4.1.X and update dependencies
2023-10-03 04:51:02 +08:00
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
34b9fe2ffe
A small tool for rebasing pr ( #3781 )
2023-09-21 19:38:51 +08:00
38bcab67f9
Rollback eslint as a breaking change, just pin the version of eslint-plugin-jsdoc to avoid error
2023-09-18 04:09:17 +08:00
22f5bb1684
Update eslint
2023-09-18 04:05:09 +08:00
59119b9e71
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
2023-09-18 03:26:59 +08:00
b3b8e9f3a0
Update to 1.23.2
2023-09-18 03:04:29 +08:00
e5345848a2
Update dependencies
2023-09-18 03:01:58 +08:00
6e887b056c
Fix docker build issue in 2.0
2023-09-01 23:47:36 +08:00
5061e42d4b
Merge remote-tracking branch 'origin/2.0.X' into 2.0.X
2023-09-01 05:23:52 +08:00
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
2023-09-01 05:19:21 +08:00
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
2023-08-30 01:39:16 +08:00
f2a1c26ef8
Update to 1.23.1
2023-08-29 03:52:53 +08:00
eec221247f
Merge branch 'master' into 2.0.X
2023-08-18 04:19:29 +08:00
9564550d5f
Update to 1.23.0
2023-08-17 22:30:28 +08:00
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
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
2023-08-09 20:09:56 +08:00
de83863627
Update to 1.23.0-beta.1
2023-08-08 18:44:11 +08:00
18a2a8eb1e
Update to 1.23.0-beta.0
2023-08-08 03:57:59 +08:00
d231a05526
Remove babel-plugin-rewire ( #3522 )
2023-08-04 01:10:15 +08:00
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
2023-08-02 15:40:19 +08:00
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>
2023-07-31 17:24:45 +08:00
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
2023-07-30 19:15:09 +08:00
9058a829a1
Update install.sh ( #3464 )
2023-07-21 16:09:35 +08:00
688f23035b
Update @louislam/ping to 0.4.4-mod.1 (Add back OpenBSD ping support)
2023-07-18 14:36:59 +08:00
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>
2023-07-17 16:15:44 +08:00
084cf01fcd
Add support for Codespaces ( #3432 )
...
* Create devcontainer.json
* WIP
* WIP
* WIP
* Create README.md
* Try to fix cypress issue
* Add extensions
* WIP
* Minor
2023-07-17 14:54:40 +08:00
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
2023-07-17 13:17:00 +08:00
345e61abca
Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders
...
# Conflicts:
# package-lock.json
# package.json
2023-07-15 01:05:34 +08:00
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>
2023-07-13 23:37:26 +08:00
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
2023-07-09 18:20:06 +08:00
771d21c4ad
Update dependencies ( #3384 )
2023-07-08 17:14:41 +08:00
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
2023-07-05 11:35:36 +08:00
8223121cd8
Update to 1.22.1
2023-07-04 20:41:30 +08:00
7c529d8f83
Check docker before build
2023-07-03 20:30:21 +08:00
d286c534bd
Improve the setup database for embedded MariaDB
2023-06-30 22:17:07 +08:00
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
2023-06-30 13:38:56 +08:00
0e725569e5
Feat: Add placeholders for badge generator
...
Chore: Save as dev dep.
2023-06-29 07:11:58 +08:00
4f6035899d
Real browser monitor type ( #3308 )
2023-06-27 15:54:33 +08:00
4b913c8b4c
Update to 1.22.0
2023-06-26 21:12:11 +08:00
97d38ee1a8
Feat: Add custom body for Webhook Notif.
2023-06-26 04:59:55 +08:00
149f8c3646
Update required node version and update dependencies
2023-06-25 12:41:32 +08:00
71c34694b7
Update to 1.22.0-beta.0
2023-06-11 15:17:26 +08:00
2128ed5ce3
Update dependencies
2023-06-11 14:44:05 +08:00
771ca09331
npm update (mainly for socket.io)
2023-05-25 13:41:35 +08:00
83a59bd984
Fix: Add password filtering
2023-05-22 04:17:45 +08:00
a27386bb92
Fix: Use croner for clear-old-data
2023-05-13 00:59:58 +08:00
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2023-05-09 00:42:11 +08:00
1a344c1371
Update to 1.21.3
2023-05-09 00:28:29 +08:00
28b0f8fc00
Update dependencies
2023-05-08 22:52:57 +08:00
f433f33418
Merge remote-tracking branch 'origin/master' into update-chartjs
...
# Conflicts:
# package-lock.json
# package.json
2023-04-11 18:58:20 +08:00
49741bbef2
🐛 fix(package.json): correct typo in deploy-demo-server script name
2023-04-07 02:09:13 +05:00
03aa685d3f
Update to 1.21.2
2023-04-04 01:58:56 +08:00
8f449ab738
Update to 1.21.2-beta.0
2023-04-01 16:36:51 +08:00
227cec86a8
WIP
2023-03-31 20:25:37 +08:00
02291730fe
WIP
2023-03-31 04:04:17 +08:00
4ae437dd61
Update to 1.21.1
2023-03-27 20:09:24 +08:00
6cb296b07a
Update SQLite and Vue
2023-03-27 19:05:18 +08:00
72317633d9
Update to 1.21.0
2023-03-20 18:07:54 +08:00
1e80365b73
Update node-ping to 0.4.4
2023-03-12 20:44:30 +08:00
0efabb4e39
Update to 1.21.0-beta.1
2023-03-10 16:16:00 +08:00
0dce492226
Update to 1.21.0-beta.0
2023-03-04 21:08:39 +08:00
3e60912992
Update node-ping
2023-03-04 21:08:21 +08:00
f17d23f5d8
A script for sorting contributors from weblate
2023-03-04 21:03:46 +08:00
beb22f743d
Chore: Update chart.js & improve perf.
2023-03-02 04:47:51 +08:00
beafbf27ad
Merge pull request #2858 from louislam/1.20.X
...
Merge 1.20.x to master
2023-02-28 18:13:15 +08:00
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
5b0b743f81
Update to 1.20.2
2023-02-26 17:00:54 +08:00
3c5f998191
Update mongodb to 4.14.0, possibly fix #2820
2023-02-26 03:23:02 +08:00
fdc3b2d57a
Update to 1.20.1
2023-02-15 03:23:59 +08:00
76bdb62a5b
Update to 1.20.0
2023-02-13 17:23:55 +08:00
c5ff010669
Add loose dependency `qs` which is used by `aliyun-sms.js`
2023-02-13 16:48:05 +08:00
f1bac7ce8a
Add a script that deploy to the demo server
2023-02-13 16:26:45 +08:00
4056951915
WIP: building database in knex.js
2023-02-11 22:21:06 +08:00
d4752b65de
WIP
2023-02-05 18:01:54 +08:00
dc4d2a77bb
WIP
2023-02-05 17:45:36 +08:00
27eddb7253
Update dockerfile
2023-02-04 18:37:12 +08:00
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
2023-02-04 18:21:34 +08:00
e631db89b8
Update to 1.20.0-beta.0
2023-02-03 13:21:19 +08:00
b0673ba9ce
Merge pull request #2570 from Computroniks/feature/#2365-allow-markdown-in-status-page-footer
...
Add support for markdown on status page
2023-02-03 12:36:50 +08:00
683f446cf5
Add support for `.env`
2023-02-01 20:07:08 +08:00
a8f0f1d872
Merge manually and remove to devDependencies
2023-02-01 15:51:33 +08:00
Louis Lam
Nelson Chan
Matthew Nickson
Henrik Gerdes
zappityzap
Muhammed Hussein karimi
Nelson Chan
Zaid-maker