306 commits

Author	SHA1	Message	Date
Louis Lam	197d44981f	Merge remote-tracking branch 'origin/master' into test/add-cypress-tests ... # Conflicts: # package.json	2022-09-09 16:32:23 +08:00
Louis Lam	de6e1e7ddd	Merge remote-tracking branch 'origin/master' into introduce-resend-interval ... # Conflicts: # server/database.js	2022-08-13 13:24:00 +08:00
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	2022-08-11 21:08:06 +08:00
Louis Lam	d0d1e0de28	Merge remote-tracking branch 'origin/master' into introduce-resend-interval ... # Conflicts: # src/pages/EditMonitor.vue	2022-08-05 15:40:06 +08:00
Louis Lam	70aa8fe453	Merge pull request #1183 from c0derMo/master ... Adding option to monitor other docker containers	2022-08-02 19:08:46 +08:00
Louis Lam	a3b1612938	getClientIP respect trustProxy setting	2022-07-31 23:36:33 +08:00
Louis Lam	a07f54f35b	Merge remote-tracking branch 'origin/master' into theS1LV3R_master	2022-07-31 23:27:35 +08:00
Moritz R	60e7824ff0	Merge branch 'master' into master	2022-07-24 14:37:22 +02:00
c0derMo	0d098b0958	Docker Hosts are now a table & have their own dialog	2022-07-22 15:47:04 +00:00
tamasmagyar	986c03aecd	test cypress run	2022-07-18 20:51:17 +02:00
Chongyi Zheng	3fa5dfc873	Use x-forwarded-host only when trustProxy is true	2022-07-12 22:59:23 -04:00
theS1LV3R	c4125a8334	style: fix linter error	2022-07-04 20:38:44 +02:00
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	2022-07-04 20:36:03 +02:00
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	2022-06-23 23:08:04 +02:00
Louis Lam	c36d9a4b8b	Fix port data type #1802	2022-06-21 22:33:09 +08:00
OidaTiftla	869a040011	Merge branch 'master' into introduce-resend-interval	2022-06-15 16:19:47 +02:00
Moritz R	ac449ec1c2	Merge branch 'master' into master	2022-06-15 11:33:00 +02:00
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	2022-06-14 10:36:29 +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	e4ad8cbfc8	Remove unused variables	2022-05-31 23:06:43 +08:00
Louis Lam	c095767f4a	[Status Page] SSR	2022-05-30 15:45:44 +08:00
Moritz R	a9f3142cee	Merge branch 'master' into master	2022-05-19 14:24:02 +02:00
Christopher Pickering	ef73af391f	added option for ntlm authorization	2022-05-13 12:58:23 -05:00
Christopher Pickering	87f933df4f	added sqlserver monitor	2022-05-12 12:48:03 -05:00
Sascha Kruse	398ecb7666	add radius check	2022-05-12 15:21:13 +02:00
Louis Lam	59be9bb971	working	2022-05-11 00:51:11 +08:00
Louis Lam	429ad384d0	Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()	2022-05-06 14:41:34 +08:00
OidaTiftla	8e99cbf426	Merge branch 'master' into introduce-resend-interval	2022-05-04 22:58:40 +02:00
Louis Lam	023db1450d	Fix #1577	2022-04-28 23:12:16 +08:00
Louis Lam	1687de163c	Merge pull request #1565 from Saibamen/eslint ... Fix some of ESLint warnings	2022-04-27 15:00:49 +08:00
Adam Stachowicz	1e595eaa76	Update linters	2022-04-26 01:26:57 +02:00
Adam Stachowicz	5fbfacf5ce	Fix ESlint warnings	2022-04-26 00:26:26 +02:00
Matthew Nickson	09e61d9d63	Changed Array<T> to type[] ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 20:02:18 +01:00
Matthew Nickson	6d22ebedca	Merge branch 'master' into add-JSDoc-comments	2022-04-21 13:01:22 +01:00
OidaTiftla	19933bbd99	Improve backwards compatibility	2022-04-21 12:18:15 +02:00
OidaTiftla	b7e2489d22	Merge branch 'master' into introduce-resend-interval	2022-04-21 11:58:04 +02:00
Matthew Nickson	03b2d8d521	Add JSDoc to server/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-20 19:56:40 +01:00
Louis Lam	200fdfb808	Merge code manually since some code moved to another file	2022-04-19 16:46:45 +08:00
Louis Lam	29d2d95c71	Merge branch '1.14.X' ... # Conflicts: # package.json # server/server.js	2022-04-19 16:43:13 +08:00
Louis Lam	919393cac9	Partially change the server core into a class, remove all require("./server") #1520	2022-04-19 15:38:59 +08:00
Louis Lam	addf75daa7	Fix MQTT password do not save	2022-04-18 19:05:14 +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	e6a8a84278	Include only nessacary data in webhook	2022-04-17 19:30:58 +08:00
Louis Lam	d71c086447	Standardize array bracket spacing	2022-04-17 15:27:35 +08:00
Louis Lam	8d8c38b1a8	Allow unused vars in args and fix more eslint issues	2022-04-17 01:39:49 +08:00
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	2022-04-16 13:28:39 +08:00
Louis Lam	0a5db0cecb	Fix #1478	2022-04-14 10:12:31 +08:00
Louis Lam	17dcf6d3a2	Merge pull request #910 from andreasbrett/logging ... introduce consistent logging	2022-04-13 23:47:08 +08:00
Louis Lam	e9ce1433cd	Change log_info to log.info by making it into an object	2022-04-13 23:33:37 +08:00