minhhn3
|
b459408b10
|
fix: resolve conflict
|
2 years ago |
Louis Lam
|
0b8d4cdaac
|
Generate Next Timeslot for recurring interval
|
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
|
2faf866e9e
|
Implement generateTimeslot() for recurring interval type
|
2 years ago |
|
Louis Lam
|
7b9766091e
|
Revert testing
|
2 years ago |
|
Louis Lam
|
a36f24d827
|
Add configurable server timezone
|
2 years ago |
|
Louis Lam
|
ad1a7c255f
|
Drop exports.entryPage fully
|
2 years ago |
George Tsomlektsis
|
3e699f8ac3
|
Fix linting errors.
|
2 years ago |
|
George Tsomlektsis
|
b0d6b5b13d
|
Fixed entry route not redirecting correctly when the status entry page changes slug.
|
2 years ago |
|
Louis Lam
|
b1465c0282
|
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
|
2 years ago |
|
Louis Lam
|
120e578398
|
Move maintenance code to `maintenance-socket-handler.js`
|
2 years ago |
|
Louis Lam
|
7017c2e625
|
Move maintenance code to `maintenance-socket-handler.js`
|
2 years ago |
|
Louis Lam
|
90761cf831
|
Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
|
2 years ago |
|
Louis Lam
|
197d44981f
|
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
# package.json
|
2 years ago |
|
minhhn3
|
3a90d246a4
|
fix: wrong type
|
2 years ago |
|
minhhn3
|
6bb79597e8
|
fix: resolve merge conflict
|
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 |
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
|
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 |
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
|
2 years ago |
|
Louis Lam
|
e4ad8cbfc8
|
Remove unused variables
|
2 years ago |
Karel Krýda
|
fa777c5bc0
|
Update server/server.js
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2 years ago |
|
Louis Lam
|
c095767f4a
|
[Status Page] SSR
|
2 years ago |
|
Moritz R
|
a9f3142cee
|
Merge branch 'master' into master
|
2 years ago |
Christopher Pickering
|
ef73af391f
|
added option for ntlm authorization
|
2 years ago |
Christopher Pickering
|
87f933df4f
|
added sqlserver monitor
|
2 years ago |
Sascha Kruse
|
398ecb7666
|
add radius check
|
2 years ago |
|
Louis Lam
|
59be9bb971
|
working
|
2 years ago |
|
Karel Krýda
|
9a35386841
|
Merge branch 'master' into master
|
2 years ago |
|
Louis Lam
|
429ad384d0
|
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
|
2 years ago |
OidaTiftla
|
8e99cbf426
|
Merge branch 'master' into introduce-resend-interval
|
2 years ago |
Karel Krýda
|
31b90d12a4
|
Added the ability to choose on which status pages maintenance information should be displayed
|
2 years ago |
|
Karel Krýda
|
b4ffcc5555
|
Added JSDoc
|
2 years ago |
|
Karel Krýda
|
ed84e56a85
|
Merge remote-tracking branch 'origin_kuma/master'
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
|
2 years ago |
