Commit Graph

475 Commits (bbd00d252e1411cad0f6bf4a966709f1693fce5a)

Author SHA1 Message Date
Louis Lam 7f9332c753 Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
2 years ago
Louis Lam f32d3af62c Merge remote-tracking branch 'origin/master' into doubles-ss_master
2 years ago
Louis Lam ef64077980 Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
2 years ago
Louis Lam cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
2 years ago
Thomas Spalinger 7f88aacbe7 make monitor start() and stop() async
2 years ago
Louis Lam 4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
2 years ago
Matthew Nickson e7feca1cd6
Added API key authentication handler
2 years ago
Matthew Nickson d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
Matthew Nickson ee2eb5109b
Added basic web interface for API keys
2 years ago
Louis Lam 4056951915 WIP: building database in knex.js
2 years ago
Louis Lam e4183ee2b7
Database Setup Page (#2738)
2 years ago
Suriya Soutmun 43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
Louis Lam d4752b65de WIP
2 years ago
Faruk Genç 4287f7e885 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace 9446c2d102
fix: use active instead of isActive in uploadBackup
2 years ago
Peace 2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace 9286dcb6ce
fix: add serverside check against endless loops
2 years ago
Louis Lam 683f446cf5 Add support for `.env`
2 years ago
Faruk Genç 35bd129d66 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace aba515e172
feat: disable childs if parent is disabled
2 years ago
Peace 97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace 645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
Louis Lam e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787)
2 years ago
Faruk Genç 9329ec9234 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam 5050ebc249 Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam aab04f6644 Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
Thomas Spalinger f155ec9ba8 remember prometheus instance and expose it
2 years ago
Faruk Genç be850dd596 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Nelson Chan e9564619f1 Feat: Implement tags manager in settings
2 years ago
Adam Spurgeon 774d754b21 Add GameDig monitor
2 years ago
Matthew Nickson 7a13b959a3
Updated to match changes in #2223
2 years ago
minhhoang 4147a4c404 fix: #2480
2 years ago
Louis Lam 765d8e1297 Fix #2318
2 years ago
Louis Lam 39987ba9ac Init server timezone
2 years ago
Louis Lam 3b87209e26 Add configurable dns cache
2 years ago
Louis Lam 4cd5b5563f Fix #1145
2 years ago
Louis Lam e478084ff9 Fix Uptime Kuma cannot be stopped
2 years ago
Louis Lam ee1a56caae Update /test-webhook and reevaluate sensitive fields
2 years ago
minhhn3 b459408b10 fix: resolve conflict
2 years ago
Matthew Nickson 4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
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
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
2 years ago
Justin Tisdale 0814d643c1 Merge branch 'master' into feature/expand-http-payload-support
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
2 years ago
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
2 years ago
minhhn3 3a90d246a4 fix: wrong type
2 years ago
Justin Tisdale 6ec6410808 Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Matthew Nickson c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
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
2 years ago
Justin Tisdale 0d58526f25 Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Justin Tisdale 2b9bf095a6 Add non-json support for http body
2 years ago
Louis Lam 3b3763351b Merge remote-tracking branch 'origin/master' into radius-check
2 years ago
Louis Lam d0d1e0de28 Merge remote-tracking branch 'origin/master' into introduce-resend-interval
2 years ago
Minh Hoàng dcecd10c88
Feat/add gRPC protocol (#1)
2 years ago
Louis Lam 70aa8fe453
Merge pull request #1183 from c0derMo/master
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
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
2 years ago
theS1LV3R 6f01a448ad
feat: get client ip from x-forwarded-for header if available
3 years ago
Louis Lam c36d9a4b8b Fix port data type #1802
3 years ago
OidaTiftla 869a040011
Merge branch 'master' into introduce-resend-interval
3 years ago
Moritz R ac449ec1c2
Merge branch 'master' into master
3 years ago
Louis Lam 6682839ec8 Merge remote-tracking branch 'origin/master' into ntml-auth
3 years ago
Louis Lam 04e22f17a9 Merge remote-tracking branch 'origin/master' into christopherpickering_master
3 years ago
Louis Lam a707b51053
Page Loading Speed Optimization (#1711)
3 years ago
Louis Lam e4ad8cbfc8 Remove unused variables
3 years ago
Karel Krýda fa777c5bc0
Update server/server.js
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
Karel Krýda 9a35386841
Merge branch 'master' into master
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
Karel Krýda 31b90d12a4 Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
Karel Krýda b4ffcc5555 Added JSDoc
3 years ago
Karel Krýda ed84e56a85 Merge remote-tracking branch 'origin_kuma/master'
3 years ago
Louis Lam 023db1450d Fix #1577
3 years ago
Louis Lam 1687de163c
Merge pull request #1565 from Saibamen/eslint
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[]
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/*
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'
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
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
3 years ago
Louis Lam 0a5db0cecb Fix #1478
3 years ago
Louis Lam 17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
3 years ago
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object
3 years ago
Moritz R 361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
Louis Lam 4053b9db1f Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam 772d009f43 Merge branch 'master' into fluencydoc_master
3 years ago
Louis Lam 6179f6c982 Merge branch 'master' into issue/1138
3 years ago
Louis Lam 94770cf865 Resolve log message null reference
3 years ago
Louis Lam 279e2eb3f6 Merge branch 'master' into logging
3 years ago
Louis Lam 0afa0be5c2 Merge branch 'master' into status-page-domain
3 years ago
Louis Lam 5027fcd320 Export server using an object class
3 years ago
Louis Lam d5e68f8453 Export monitor list
3 years ago
Louis Lam 082c2dd32d Remove restartMonitors() and move proxy socket events to a socket handler file
3 years ago
Louis Lam c4e74c9943 Render <StatusPage> if domain matched
3 years ago
Louis Lam 70311f7a5a Add an option to enable/disable the domain name expiry notification #1364
3 years ago
Louis Lam 48d679234a Stop bree and cloudflared while the server shutting down
3 years ago
Moritz R af44b0beab
Merge branch 'master' into master
3 years ago
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy
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 a6b52b7ba6 Merge branch 'master' into cloudflared
3 years ago
Louis Lam b8dea3a823 Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam 0da6e6b1fb Some improvements
3 years ago
Louis Lam 44fb2a88f2 Add cloudflared socket handler
3 years ago
OidaTiftla d8013f31e8 Update version after merging new master branch
3 years ago
OidaTiftla 91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
3 years ago
Louis Lam 3adda48f3a Load the status page list earlier
3 years ago
Louis Lam 719a136d1e [Status Page] Improved entry page
3 years ago
Louis Lam 50d6e888c2 [new status page] wip
3 years ago
Uğur Erkan 78d76512ba Add http and https proxy feature
3 years ago
OidaTiftla b69a8b8493
Fix formatting
3 years ago
OidaTiftla 1ac904d6d6 Introduce resend interval if down
3 years ago
Karel Krýda 0d3414c6d6 A complete maintenance planning system has been created
3 years ago
c0derMo 29df70949d Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
Louis d1a99b0a22 Check Node.js version, better error message
3 years ago