c0derMo 
							
						 
					 
					
						
						
							
						
						32cfd411f8 
					 
					
						
						
							
							Fixed style & code errors  
						
						
						
						
					 
					
						2022-05-19 12:35:55 +00:00 
						 
				 
			
				
					
						
							
							
								Moritz R 
							
						 
					 
					
						
						
							
						
						a9f3142cee 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2022-05-19 14:24:02 +02:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						7da9f139c1 
					 
					
						
						
							
							Bug fix  
						
						
						
						
					 
					
						2022-05-09 21:10:12 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						429ad384d0 
					 
					
						
						
							
							Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()  
						
						
						
						
					 
					
						2022-05-06 14:41:34 +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 
							
						 
					 
					
						
						
							
						
						5fbfacf5ce 
					 
					
						
						
							
							Fix ESlint warnings  
						
						
						
						
					 
					
						2022-04-26 00:26:26 +02:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						46da5e51be 
					 
					
						
						
							
							Fix JSDoc grammar  
						
						... 
						
						
						
						Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
					 
					
						2022-04-22 19:10:13 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						1eecdec2d9 
					 
					
						
						
							
							Update JSDoc for better clarity  
						
						... 
						
						
						
						Co-authored-by: Nelson Chan <chakflying@hotmail.com >
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
					 
					
						2022-04-22 18:42:47 +01: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 
							
						 
					 
					
						
						
							
						
						0083485d4c 
					 
					
						
						
							
							Updated server/model/* JSDoc to match new methods  
						
						... 
						
						
						
						Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
					 
					
						2022-04-21 18:30:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						6d22ebedca 
					 
					
						
						
							
							Merge branch 'master' into add-JSDoc-comments  
						
						
						
						
					 
					
						2022-04-21 13:01:22 +01:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						359a490ae3 
					 
					
						
						
							
							Fix   #1510  
						
						
						
						
					 
					
						2022-04-18 15:21:58 +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 
							
						 
					 
					
						
						
							
						
						47c72192e1 
					 
					
						
						
							
							[eslint] Enable yoda and eqeqeq  
						
						
						
						
					 
					
						2022-04-17 15:43:03 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						d71c086447 
					 
					
						
						
							
							Standardize array bracket spacing  
						
						
						
						
					 
					
						2022-04-17 15:27:35 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8eb83394f7 
					 
					
						
						
							
							Refine UI/UX for custom css / footer text. Add switch for show/hide powered by  
						
						
						
						
					 
					
						2022-04-17 14:53:13 +08:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						45f44b183d 
					 
					
						
						
							
							Add JSDoc to server/model/*  
						
						... 
						
						
						
						Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
					 
					
						2022-04-16 21:11:45 +01:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8d8c38b1a8 
					 
					
						
						
							
							Allow unused vars in args and fix more eslint issues  
						
						
						
						
					 
					
						2022-04-17 01:39:49 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						e34420368b 
					 
					
						
						
							
							Remove try-catch and fix username/password/port not working for mqtt  
						
						
						
						
					 
					
						2022-04-17 01:06:47 +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 
							
						 
					 
					
						
						
							
						
						649f3106e1 
					 
					
						
						
							
							Enforce semicolon, fix format globally  
						
						
						
						
					 
					
						2022-04-14 01:20:54 +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 
						 
				 
			
				
					
						
							
							
								Moritz R 
							
						 
					 
					
						
						
							
						
						361e44ad6a 
					 
					
						
						
							
							Merge branch 'louislam:master' into master  
						
						
						
						
					 
					
						2022-04-13 15:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						279e2eb3f6 
					 
					
						
						
							
							Merge branch 'master' into logging  
						
						... 
						
						
						
						# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js 
						
						
					 
					
						2022-04-12 16:32:14 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c9fa183712 
					 
					
						
						
							
							Manage domain names  
						
						
						
						
					 
					
						2022-04-10 00:25:27 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c4e74c9943 
					 
					
						
						
							
							Render <StatusPage> if domain matched  
						
						
						
						
					 
					
						2022-04-06 22:43:22 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						70311f7a5a 
					 
					
						
						
							
							Add an option to enable/disable the domain name expiry notification  #1364  
						
						
						
						
					 
					
						2022-04-05 21:27:50 +08:00 
						 
				 
			
				
					
						
							
							
								Moritz R 
							
						 
					 
					
						
						
							
						
						af44b0beab 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2022-04-03 17:19:29 +02:00 
						 
				 
			
				
					
						
							
							
								Moritz R 
							
						 
					 
					
						
						
							
						
						84a0b24448 
					 
					
						
						
							
							Update server/model/monitor.js  
						
						... 
						
						
						
						As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
					 
					
						2022-04-03 17:15:21 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						
						
					 
					
						2022-04-01 14:57:35 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						be88351eb3 
					 
					
						
						
							
							Merge pull request  #1136  from chakflying/fix/prometheus-on-delete  
						
						... 
						
						
						
						Fix: Remove prometheus metrics on delete [Test needed] 
						
						
					 
					
						2022-03-27 11:05:50 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						aef0a66205 
					 
					
						
						
							
							[Status Page] Simplify show tags logic  
						
						
						
						
					 
					
						2022-03-18 17:56:46 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						e87cdf4d09 
					 
					
						
						
							
							[Status Page] wip, upload logo and status page listing  
						
						
						
						
					 
					
						2022-03-17 16:42:26 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						1033ca5cf4 
					 
					
						
						
							
							[Status Page] wip, combine api, add status_page_id into group and incident tables  
						
						
						
						
					 
					
						2022-03-16 15:38:10 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						18ec42b060 
					 
					
						
						
							
							[Status Page] wip  
						
						
						
						
					 
					
						2022-03-16 14:14:47 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						50d6e888c2 
					 
					
						
						
							
							[new status page] wip  
						
						
						
						
					 
					
						2022-03-10 21:34:30 +08:00 
						 
				 
			
				
					
						
							
							
								Uğur Erkan 
							
						 
					 
					
						
						
							
						
						8078d0618d 
					 
					
						
						
							
							Add socks proxy support to proxy feature  
						
						... 
						
						
						
						- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
  and moved under proxy class.
Thanks for suggestion @thomasleveil 
						
						
					 
					
						2022-03-06 19:34:51 +03:00 
						 
				 
			
				
					
						
							
							
								Uğur Erkan 
							
						 
					 
					
						
						
							
						
						78d76512ba 
					 
					
						
						
							
							Add http and https proxy feature  
						
						... 
						
						
						
						Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies 
						
						
					 
					
						2022-03-06 19:34:49 +03:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						595cd93220 
					 
					
						
						
							
							Check invalid interval  
						
						
						
						
					 
					
						2022-02-24 15:11:17 +08:00 
						 
				 
			
				
					
						
							
							
								c0derMo 
							
						 
					 
					
						
						
							
						
						29df70949d 
					 
					
						
						
							
							Add ability to connect to daemon via http / tcp for windows compatibility  
						
						
						
						
					 
					
						2022-01-22 01:57:37 +00:00 
						 
				 
			
				
					
						
							
							
								Tarun Singh 
							
						 
					 
					
						
						
							
						
						22256dfcd2 
					 
					
						
						
							
							added timeout for removing the dead loop state  
						
						
						
						
					 
					
						2022-01-20 13:04:59 -05:00 
						 
				 
			
				
					
						
							
							
								c0derMo 
							
						 
					 
					
						
						
							
						
						4818bb67d6 
					 
					
						
						
							
							Added trailing comma, fixed spelling & translation  
						
						
						
						
					 
					
						2022-01-14 09:09:37 +00:00 
						 
				 
			
				
					
						
							
							
								c0derMo 
							
						 
					 
					
						
						
							
						
						c5cc42272f 
					 
					
						
						
							
							Fixing the editing of docker container & adding english translation  
						
						
						
						
					 
					
						2022-01-13 18:28:45 +00:00 
						 
				 
			
				
					
						
							
							
								c0derMo 
							
						 
					 
					
						
						
							
						
						b0259b5592 
					 
					
						
						
							
							Added docker container monitor  
						
						
						
						
					 
					
						2022-01-13 16:17:07 +00:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						227bbdea2f 
					 
					
						
						
							
							[MQTT] Try to improve error handling  
						
						
						
						
					 
					
						2022-01-13 12:42:34 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6272514820 
					 
					
						
						
							
							[MQTT] Use existing fields instead of creating new ones (Server)  
						
						
						
						
					 
					
						2022-01-13 11:53:08 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						076d6bdbb6 
					 
					
						
						
							
							Merge branch 'master' into mqtt  
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	server/database.js 
						
						
					 
					
						2022-01-13 11:09:16 +08:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						1e92487f30 
					 
					
						
						
							
							Chore: Remove onDelete as unused  
						
						
						
						
					 
					
						2022-01-07 12:28:08 +08:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						edd2534a1b 
					 
					
						
						
							
							Fix: Clear metrics also on stop and edit  
						
						
						
						
					 
					
						2022-01-07 12:26:26 +08:00