Matthew Nickson
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
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
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2 years ago
Louis Lam
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2 years ago
Moritz R
60e7824ff0
Merge branch 'master' into master
2 years ago
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
tamasmagyar
986c03aecd
test cypress run
2 years ago
Matthew Nickson
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
theS1LV3R
c4125a8334
style: fix linter error
2 years ago
Zoe
0a368ff553
feat: add x-real-ip as a secondary header for client ip
...
Now allows both x-forwarded-for as well as x-real-ip to be used for the client ip, preferring x-forwarded-for
2 years ago
theS1LV3R
6f01a448ad
feat: get client ip from x-forwarded-for header if available
...
Useful for use-cases where Uptime Kuma is running behind a reverse proxy
2 years ago
Louis Lam
c36d9a4b8b
Fix port data type #1802
2 years ago
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
Moritz R
ac449ec1c2
Merge branch 'master' into master
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
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
e4ad8cbfc8
Remove unused variables
3 years ago
Louis Lam
c095767f4a
[Status Page] SSR
3 years ago
Moritz R
a9f3142cee
Merge branch 'master' into master
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
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam
023db1450d
Fix #1577
3 years ago
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
Adam Stachowicz
1e595eaa76
Update linters
3 years ago
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
3 years ago
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
OidaTiftla
19933bbd99
Improve backwards compatibility
3 years ago
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
200fdfb808
Merge code manually since some code moved to another file
3 years ago
Louis Lam
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
Louis Lam
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
Louis Lam
addf75daa7
Fix MQTT password do not save
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
e6a8a84278
Include only nessacary data in webhook
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
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