Louis Lam
33de7bdb1c
Merge conflict
2023-05-09 00:45:31 +08:00
Louis Lam
8a3bce44ef
Update dependenices
2023-05-02 16:22:00 +08:00
Louis Lam
8c9423f4de
Merge conflicts manually
2023-04-11 19:01:17 +08:00
Nelson Chan
beb22f743d
Chore: Update chart.js & improve perf.
2023-03-02 04:47:51 +08:00
Louis Lam
beafbf27ad
Merge pull request #2858 from louislam/1.20.X
...
Merge 1.20.x to master
2023-02-28 18:13:15 +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
Louis Lam
5b0b743f81
Update to 1.20.2
2023-02-26 17:00:54 +08:00
Louis Lam
3c5f998191
Update mongodb to 4.14.0, possibly fix #2820
2023-02-26 03:23:02 +08:00
Louis Lam
fdc3b2d57a
Update to 1.20.1
2023-02-15 03:23:59 +08:00
Louis Lam
c5ff010669
Add loose dependency qs
which is used by aliyun-sms.js
2023-02-13 16:48:05 +08:00
Louis Lam
f1bac7ce8a
Add a script that deploy to the demo server
2023-02-13 16:26:45 +08:00
Louis Lam
c30e88ece2
Update dependencies
2023-02-10 17:52:46 +08:00
Louis Lam
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
Louis Lam
683f446cf5
Add support for .env
2023-02-01 20:07:08 +08:00
Louis Lam
a8f0f1d872
Merge manually and remove to devDependencies
2023-02-01 15:51:33 +08:00
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
Louis Lam
0a58069742
Merge pull request #2641 from louislam/1.19.X
...
Merge 1.19.6 to 1.20.X
2023-01-19 14:27:45 +08:00
Louis Lam
6cd6a2edf0
Fix ping issue on Windows #2636
2023-01-19 02:16:07 +08:00
Louis Lam
54d4c4d3f7
Merge package-lock.json
2023-01-17 21:18:13 +08:00
Louis Lam
e9497ac1ab
Fix knex.js issue
2023-01-14 20:49:34 +08:00
Louis Lam
d9f12a6376
Fallback to /bin/ping
if ping
is not found
2023-01-12 01:05:16 +08:00
Adam Spurgeon
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
Louis Lam
fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
...
feat: Change ping module to danielzzz/node-ping
2023-01-05 20:40:41 +08:00
Louis Lam
4239cf4255
Pin dependency of ping
2023-01-05 17:11:37 +08:00
Louis Lam
4bf23fdd1a
Update jsonwebtoken from ~8 to ~9
2023-01-04 15:55:36 +08:00
Louis Lam
f99a64da67
Run npm update
2023-01-04 15:48:09 +08:00
Matthew Nickson
73835f3328
Changed from ping-lite to ping module
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
#Fixes 2126
2023-01-03 20:03:36 +00:00
thefourCraft
f6ea1fe9a5
he-IL ( #2460 )
2022-12-27 14:04:53 +08:00
Silvio Wangler
92caec95fe
Added new language German (Switzerland)
2022-12-06 13:43:37 +01:00
Louis Lam
8cdbe37f6f
Update core-js
2022-12-04 21:41:08 +08:00
Louis Lam
370d522920
Pin dependency of axios-ntlm to 1.3.0. As 1.3.1 causes error
2022-11-25 14:00:33 +08:00
Louis Lam
e0a1ad8a1c
Update dependencies and drop start-server-watch-dev
as it is unstable
2022-11-25 01:32:33 +08:00
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 19:04:14 +00:00
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:46:58 +00:00
Louis Lam
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2022-11-11 12:34:35 +08:00
Louis Lam
54efde8185
Update socket.io and remove an useless event listener
2022-10-29 23:29:33 +08:00
minhhn3
3d1237ed53
fix: resolve conflict
2022-10-26 20:50:34 +07:00
minhhn3
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
Louis Lam
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
Louis Lam
b60dde0b2d
Update SQLite
2022-10-15 15:18:54 +08:00
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
Louis Lam
c1ccaa7a9f
WIP
2022-10-10 20:48:11 +08:00
Louis Lam
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2022-10-10 16:50:25 +08:00
Louis Lam
bd42450e55
Update vue-i18n from 9.1.9 to 9.2.2, force to use production version of vue-i18n in order to improve the performance
2022-10-10 16:23:32 +08:00
Louis Lam
a36f24d827
Add configurable server timezone
2022-10-09 20:59:58 +08:00
Louis Lam
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2022-10-09 19:26:00 +08:00
Louis Lam
1c8631af8d
Pin dependencies ( #2205 )
2022-10-09 16:02:47 +08:00
Louis Lam
6e07ed2081
Fix #2186
2022-10-07 15:02:19 +08:00
Louis Lam
b993859926
Drop Jest e2e testing ( #2174 )
2022-10-05 14:26:30 +08:00
Matthew Nickson
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 01:52:53 +01:00
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2022-09-24 02:33:29 +08:00
Louis Lam
68875c3091
Fix merging issue
2022-09-13 22:22:01 +08:00
Louis Lam
d63022676a
Fix build issue after updated vite
2022-09-13 15:17:39 +08:00
Louis Lam
104d521633
Update vite from 2.9.9 to 3.1.0
2022-09-12 18:33:46 +08:00
Muhammed Hussein Karimi
626accedee
change node version
2022-09-01 16:47:25 +04:30
Muhammed Hussein Karimi
b890812411
use npm 7
2022-09-01 16:36:24 +04:30
Muhammed Hussein Karimi
b9b00050dd
fix package lock version
2022-08-28 21:37:19 +04:30
Muhammed Hussein Karimi
82dd9a7c16
golaert req fix and axios update for formdata
2022-08-24 10:36:29 +04:30
minhhn3
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
Louis Lam
2af754b5e8
Update package-lock.json
2022-08-11 21:09:16 +08:00
minhhn3
2232236a7a
[empty commit] pull request for add gRPC protocol
2022-08-03 13:39:31 +07:00
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07:00
Louis Lam
f1bcecb0c6
Merge package-lock.json
2022-07-24 14:08:03 +08:00
Louis Lam
239611a016
Do not set sendUrl if sendUrl is undefined
2022-07-22 23:27:02 +08:00
Louis Lam
8f7b7e74c9
socks-proxy-agent 6.2.X is a breaking change, freeze to 6.1.1.
2022-07-18 23:28:19 +08:00
Louis Lam
1999541802
Merge remote-tracking branch 'origin/master' into dns
2022-07-18 23:25:14 +08:00
Louis Lam
624678826d
Move all frontend dependencies to devDependencies, as it is not used in the production environment
2022-07-04 03:59:20 +08:00
Louis Lam
e8c3807594
Move all frontend dependencies to devDependencies, as it is not used in the production environment
2022-07-04 03:54:56 +08:00
Louis Lam
e5e8db6c38
Add cacheable-lookup
2022-06-29 22:17:47 +08:00
Louis Lam
8542e6cbb9
Drop npm-check-updates due to security vulnerability of got
, and it is unlikely to be fixed shortly
...
Read more:
https://github.com/raineorshine/npm-check-updates/pull/1147#event-6880466174
2022-06-27 10:50:38 +08:00
Louis Lam
9650418ef7
Fix dependencies warning
2022-06-25 20:55:14 +08:00
Louis Lam
1f5466a3e8
Revert #1598
2022-06-23 15:54:33 +08:00
Louis Lam
d5da5af174
Update to 1.17.0
2022-06-22 20:13:39 +08:00
Christopher Pickering
660005b143
cleaned up code
2022-06-14 08:49:36 -05:00
Louis Lam
f25ca96308
Update package-lock.json
2022-06-14 10:37:15 +08:00
Louis Lam
b72a279361
Update package-lock.json
2022-06-13 18:54:02 +08:00
Louis Lam
7f432bd916
Remove axios-cached-dns-resolve-test
2022-06-13 18:52:08 +08:00
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2022-06-11 20:59:58 +08:00
Louis Lam
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
2022-06-05 23:43:25 +08:00
Louis Lam
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
Louis Lam
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
2022-05-30 14:00:39 +08:00
Louis Lam
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
Louis Lam
59be9bb971
working
2022-05-11 00:51:11 +08:00
Louis Lam
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
2022-05-07 13:26:47 +08:00
Louis Lam
96536ae391
Rebuild package-lock.json
2022-05-02 12:36:12 +08:00
Louis Lam
15820c6937
Update SQLite
2022-05-01 19:45:00 +08:00
Louis Lam
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
2022-05-01 17:03:11 +08:00
Louis Lam
023db1450d
Fix #1577
2022-04-28 23:12:16 +08:00
Aram Akhavan
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
Louis Lam
4114f43b48
Start both dev servers in one command
2022-04-26 02:18:14 +08:00
Jens Neuber
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
2022-04-20 10:10:14 +02:00
Louis Lam
f712fe85e5
Update node-sqlite, sqlite from 3.36 to 3.38
2022-04-18 12:44:32 +08:00
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
46e1a628a7
Update package-lock.json
2022-04-17 15:04:59 +08:00
Louis Lam
03bcf5c766
Add a simple mqtt server for testing
2022-04-17 01:07:54 +08:00
Louis Lam
64a0e1aa9b
Update package-lock.json
2022-04-16 13:31:40 +08:00
Louis Lam
2b0c184a88
Update package-lock
2022-04-14 01:21:43 +08:00
Louis Lam
4738581c66
Update dependencies
2022-04-02 11:34:00 +08:00
Uğur Erkan
9e27acb511
Add socks proxy agent
2022-03-06 19:34:51 +03:00