Louis Lam
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
2 years ago
Louis Lam
e631db89b8
Update to 1.20.0-beta.0
2 years ago
Louis Lam
b0673ba9ce
Merge pull request #2570 from Computroniks/feature/#2365-allow-markdown-in-status-page-footer
...
Add support for markdown on status page
2 years ago
Louis Lam
683f446cf5
Add support for `.env`
2 years ago
Louis Lam
a8f0f1d872
Merge manually and remove to devDependencies
2 years ago
Louis Lam
f82d7b4007
Merge remote-tracking branch 'origin/master' into feature/#2365-allow-markdown-in-status-page-footer
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
2 years ago
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
Louis Lam
0a58069742
Merge pull request #2641 from louislam/1.19.X
...
Merge 1.19.6 to 1.20.X
2 years ago
Louis Lam
2b57b3e863
Update to 1.19.6
2 years ago
Louis Lam
6cd6a2edf0
Fix ping issue on Windows #2636
2 years ago
Louis Lam
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2 years ago
Louis Lam
7ef404ccc1
Update to 1.19.5
2 years ago
Louis Lam
1326761a8a
Update mongodb and simplify the logic of mongodbPing
2 years ago
Louis Lam
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
Louis Lam
e9497ac1ab
Fix knex.js issue
2 years ago
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2 years ago
Louis Lam
d9f12a6376
Fallback to `/bin/ping` if `ping` is not found
2 years ago
Louis Lam
cc4ed308b0
Merge pull request #2581 from twiggotronix/add-frontend-unit-tests
...
Add frontend unit tests
2 years ago
David Twigger
1565da87cf
Implement cypress unit testing
2 years ago
Matthew Nickson
6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer
2 years ago
Louis Lam
5f5c2d7c46
Update to 1.19.4
2 years ago
Louis Lam
c00abac834
Separate golang build layer
2 years ago
Matthew Nickson
6bc0bd84af
Allowed markdown in footer of status page
...
Markdown support has been added using the marked module. To secure
against XSS attacks, DOMPurify is used to sanitize the generated HTML
before it is loaded on the page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Adam Spurgeon
774d754b21
Add GameDig monitor
2 years ago
long2ice
40ebc2df79
feat: support redis monitor
2 years ago
Louis Lam
fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
...
feat: Change ping module to danielzzz/node-ping
2 years ago
Louis Lam
4239cf4255
Pin dependency of `ping`
2 years ago
Louis Lam
4bf23fdd1a
Update jsonwebtoken from ~8 to ~9
2 years ago
Matthew Nickson
73835f3328
Changed from ping-lite to ping module
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
#Fixes 2126
2 years ago
Louis Lam
b8e8c1b9db
Update to 1.19.3
2 years ago
Louis Lam
aec80b53d5
Update to 1.19.2
2 years ago
Louis Lam
056d957c1e
Update to 1.19.1
2 years ago
Louis Lam
6962e056ce
Update to 1.19.0
2 years ago
Louis Lam
5e976afb27
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile
# package-lock.json
2 years ago
Louis Lam
2532becf61
Update to 1.19.0-beta.2
2 years ago
Louis Lam
3040bd41d9
Speed up armv7 build time of healthcheck by using go compiler cross-build feature in the host
2 years ago
Louis Lam
b1170211b7
Update to 1.19.0-beta.1
2 years ago
Louis Lam
8cdbe37f6f
Update core-js
2 years ago
Louis Lam
370d522920
Pin dependency of axios-ntlm to 1.3.0. As 1.3.1 causes error
2 years ago
Louis Lam
e0a1ad8a1c
Update dependencies and drop `start-server-watch-dev` as it is unstable
2 years ago
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
rmarops
b059a36e66
added MongoDB ping monitor
2 years ago
Louis Lam
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2 years ago
Louis Lam
214ddc264d
Fix mistake
2 years ago
Louis Lam
2ea71839d1
Add `npm run start-server-watch-dev` for watching server code changes and restart (Node.js 19 only)
2 years ago
Louis Lam
54efde8185
Update socket.io and remove an useless event listener
2 years ago
minhhn3
3d1237ed53
fix: resolve conflict
2 years ago
minhhn3
b459408b10
fix: resolve conflict
2 years ago
Louis Lam
06755f249d
Update to 1.19.0-beta.0
2 years ago
Louis Lam
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
Louis Lam
b60dde0b2d
Update SQLite
2 years ago
Louis Lam
f6bbd1ca67
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
Louis Lam
2ee8378814
Update to 1.18.5
2 years ago
Louis Lam
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
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
2 years ago
Louis Lam
a36f24d827
Add configurable server timezone
2 years ago
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
2 years ago
Louis Lam
07f9aafd7b
Update to 1.18.4
2 years ago
Louis Lam
1c8631af8d
Pin dependencies ( #2205 )
2 years ago
Matthew Nickson
f67d7cdf3f
Make update-language-files command more useful ( #2198 )
...
* [empty commit] pull request for Fix language update script
* Avoid mass changes with update-language-files
This commit updates the update-language-files script to prevent mass
changes as seen on a number of recent PRs where the contributer has
ran the script and comitted the results.
The script has been updated to now require the --language argument to
specify which language file to update. This ensures that only that file
is updated instead of all files. If the provided language code does not
already exist, a new file with that code is created. This should make
it easier to add new languages as you only need to pass the language
code to the script.
The base lang code is now also passed as an optional argument to negate
the need for a seperate script entry in package.json.
The script has been restructures into a couple of functions to make it
easier to understand.
ESlint now only checks the changed file instead of
them all in order to improve performance.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Updated translation docs for new command
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* [update-language-files] Add cross-env-shell
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
Louis Lam
6e07ed2081
Fix #2186
2 years ago
Louis Lam
60460442f8
Update to 1.18.3
2 years ago
Ben Scobie
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
Louis Lam
b993859926
Drop Jest e2e testing ( #2174 )
2 years ago
Louis Lam
afbc283423
Move Cypress directory and convert it to JavaScript ( #2170 )
2 years ago
Louis Lam
16b2cf0e89
Update to 1.18.2
2 years ago
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>
2 years ago
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2 years ago
Louis Lam
68875c3091
Fix merging issue
2 years ago
Louis Lam
f35d7c0a1a
Merge remote-tracking branch 'origin/master' into feat/add-gRPC-protocol
...
# Conflicts:
# package-lock.json
2 years ago
Louis Lam
d63022676a
Fix build issue after updated vite
2 years ago
Louis Lam
104d521633
Update vite from 2.9.9 to 3.1.0
2 years ago
Louis Lam
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
Louis Lam
e90a4f1f34
Merge pull request #2023 from louislam/pr-test
...
A special docker image for testing pull requests
2 years ago
Louis Lam
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2 years ago
Louis Lam
676e64c77d
Merge branch 'goalert-notification' of https://github.com/mhkarimi1383/uptime-kuma into pr-test
2 years ago
Louis Lam
cf10e26aff
Update to 1.18.0
2 years ago
Louis Lam
fd2df562b1
Add checkout pr logic
2 years ago
Louis Lam
e0cdc3e7c5
Update dockerfile for pr-test
2 years ago
Muhammed Hussein Karimi
82dd9a7c16
golaert req fix and axios update for formdata
2 years ago
minhhn3
6bb79597e8
fix: resolve merge conflict
2 years ago
Louis Lam
af94424283
Update to 1.18.0-beta.0
2 years ago
Louis Lam
a6007adce3
Update to 1.18.0-beta.1
2 years ago
Louis Lam
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
minhhn3
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
Louis Lam
b0d39b44ce
Testing
2 years ago
Louis Lam
301b2007a0
Drop Alpine support
2 years ago
tamasmagyar
986c03aecd
test cypress run
2 years ago
tamasmagyar
31c388a6e3
added cypress framework and tests for setup page
2 years ago
Louis Lam
17ed051401
Add CacheableDnsHttpAgent.install()
2 years ago
Louis Lam
9cd060c6c3
socks-proxy-agent 6.2.X is a breaking change, freeze to 6.1.1.
2 years ago
Louis Lam
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
Louis Lam
624678826d
Move all frontend dependencies to devDependencies, as it is not used in the production environment
2 years ago
Louis Lam
e8c3807594
Move all frontend dependencies to devDependencies, as it is not used in the production environment
2 years ago
Louis Lam
e5e8db6c38
Add cacheable-lookup
2 years ago
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
2 years ago
Louis Lam
9650418ef7
Fix dependencies warning
2 years ago
Louis Lam
0ecaa2cbd7
Update to 1.17.1
2 years ago
Louis Lam
1f5466a3e8
Revert #1598
2 years ago
Louis Lam
d5da5af174
Update to 1.17.0
2 years ago
Louis Lam
dd09351c8e
Update to 1.17.0-beta.1
2 years ago
Christopher Pickering
edcdedcaae
Added check for blank password.
2 years ago
Christopher Pickering
945288f0c0
Added postgres monitor
2 years ago
Louis Lam
8abbc9fd15
Update to 1.17.0-beta.0
2 years ago
Louis Lam
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2 years ago
Louis Lam
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
Louis Lam
7f432bd916
Remove axios-cached-dns-resolve-test
2 years ago
Louis Lam
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
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
3 years ago
Louis Lam
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
3 years ago
Louis Lam
857e88b27e
Update to 1.16.1
3 years ago
Louis Lam
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
Louis Lam
334cb57fed
Update to 1.16.0
3 years ago
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
Louis Lam
398219f847
Update to 1.16.0-beta.0
3 years ago
Christopher Pickering
ef73af391f
added option for ntlm authorization
3 years ago
Christopher Pickering
87f933df4f
added sqlserver monitor
3 years ago
Sascha Kruse
398ecb7666
add radius check
3 years ago
Louis Lam
59be9bb971
working
3 years ago
Louis Lam
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
Greg Smith
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
Louis Lam
25cc54bf72
Try to give more time for axios-cached-dns-resolve test
3 years ago
Louis Lam
3700b16c5b
Copy and add axios-cached-dns-resolve test
3 years ago
Louis Lam
15820c6937
Update SQLite
3 years ago
Louis Lam
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
Louis Lam
63c8d24d6f
As legacy-peer-deps is specified in .npmrc, `install-legacy` and `update-legacy` are not actually needed.
3 years ago
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
Louis Lam
26230a3d3a
Update to 1.15.1
3 years ago
Louis Lam
752415dae6
Merge pull request #1566 from Saibamen/fix_duplicated_PR_comments
...
Fix duplicated PR comments
3 years ago
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
3 years ago
Adam Stachowicz
dcdbb7be8b
Use separate job for linters
3 years ago
Adam Stachowicz
b874ea8b28
Add missing lint-fix:style command
3 years ago
Adam Stachowicz
1e595eaa76
Update linters
3 years ago
Louis Lam
4114f43b48
Start both dev servers in one command
3 years ago
Louis Lam
751924b335
Update to 1.15.0
3 years ago
Jens Neuber
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Louis Lam
7c13b1b6cb
Update to 1.15.0-beta.1
3 years ago
Louis Lam
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
Louis Lam
b782b25e17
Update to 1.14.1
3 years ago
Louis Lam
f712fe85e5
Update node-sqlite, sqlite from 3.36 to 3.38
3 years ago
Louis Lam
c28b90feb4
Update to 1.15.0-beta.0
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
Louis Lam
03bcf5c766
Add a simple mqtt server for testing
3 years ago
Louis Lam
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
3 years ago
Louis Lam
8d0446dc38
Add lint as part of test
3 years ago
Louis Lam
3436e26ed4
Fix styleline, fix css format issues globally
3 years ago
Louis Lam
1ba92d803e
Update to 1.14.0
3 years ago
Louis Lam
316e65d35a
Update to 1.14.0-beta.2
3 years ago
Louis Lam
8b45a95cc3
Merge branch '1.13.X'
...
# Conflicts:
# package.json
3 years ago
Louis Lam
02becfd113
Update to 1.13.2
3 years ago
Louis Lam
99042e6991
Update to 1.14.0-beta.1
3 years ago
Louis Lam
4738581c66
Update dependencies
3 years ago
Louis Lam
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
3 years ago
Louis Lam
f02e9c44ec
Update to 1.14.0-beta.0
3 years ago
Louis Lam
b72a2d350f
Set cloudflared token from env var or arg
3 years ago
Louis Lam
82ea896bbc
Improve the workflow of cloudflared
3 years ago
Louis Lam
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
3 years ago
Louis Lam
7d3cbff794
[Cloudflared] Install into base docker
3 years ago
Louis Lam
623d03dc6f
Fix release process
3 years ago
Louis Lam
f52e527850
Update to 1.13.1
3 years ago
Louis Lam
6c7a0ff7d3
Fix release script
3 years ago
Louis Lam
2abdf2efad
Update to 1.13.0
3 years ago
Louis Lam
668dffc2c5
Simplify final release
3 years ago
Louis Lam
909618a29a
Update to 1.13.0-beta.2
3 years ago
Louis Lam
4a4ffc96dd
Fix setup
3 years ago
Louis Lam
76f991ecd8
Update beta process
3 years ago
Louis Lam
b0bda9f9d2
Fix beta release script
3 years ago
Louis Lam
cafa61e3af
Add beta tag
3 years ago
Louis Lam
58ee071fae
Release process for beta
3 years ago
Louis Lam
4e95e9ea51
Add process for beta release
3 years ago
Louis Lam
5f778b9763
Merge pull request #835 from willianrod/feat/add-favicon-badges
...
Add badges to favicon
3 years ago
Louis Lam
04d93c2747
Merge branch 'master' into willianrod_feat/add-favicon-badges
...
# Conflicts:
# package-lock.json
# src/mixins/socket.js
3 years ago
Mark Vicente
95a2c967c6
check-password-strength new version 2.0.5 that support additional symbols/special characters referenced from owasp list.
3 years ago
Uğur Erkan
9e27acb511
Add socks proxy agent
3 years ago
Uğur Erkan
2cc7a990ff
Add http and https agents
3 years ago
Louis Lam
b31af8a15c
update to 1.12.1
3 years ago
Louis Lam
d5d63474d8
update to 1.12.0
3 years ago
Louis Lam
3a5b413af4
Update axios to 0.26.0 due to vulnerability
3 years ago
Jens Neuber
454c1687cf
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Louis Lam
e7e30bf497
update to 1.11.4
3 years ago
Louis Lam
742ad083e5
Fix security vulnerabilities
3 years ago
Louis Lam
41f1686147
Fix security vulnerabilities
3 years ago
Jens Neuber
28be32fc68
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Louis
a0d51a15cf
Fix security vulnerabilities
3 years ago
Louis Lam
bfee63452d
Merge branch 'master' into mqtt
3 years ago
Louis Lam
fd1fce0143
Update stylelint from 13.13.x to 14.2.x
3 years ago
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Louis Lam
ec5037f30d
update to 1.11.3
3 years ago
Louis Lam
8f3ec33591
update to 1.11.2
3 years ago
Jens Neuber
35360e2069
add badges
3 years ago
Louis Lam
4005856ba6
run build dist when building docker image
3 years ago
Louis Lam
5ee5ea909d
Add Github Action: close-incorrect-issue.yml
3 years ago
Louis Lam
8bb8b0a53c
update to 1.11.1
3 years ago
Louis Lam
f9cd0eb084
fix upload-artifacts
3 years ago