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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nelson Chan 
								
							 
						 
						
							
							
							
							
								
							
							
								f6ef390c76 
								
							 
						 
						
							
							
								
								Fix: Remove Prom. metrics on delete monitor  
							
							
							
						 
						
							2022-01-07 12:04:57 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								a42932a43e 
								
							 
						 
						
							
							
								
								Simulate Chrome's request Accept header. Better handling of  #1067  
							
							
							
						 
						
							2021-12-16 15:09:10 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								dcc91d6c72 
								
							 
						 
						
							
							
								
								Fix   #922  
							
							
							
						 
						
							2021-12-08 14:59:59 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								92a5f18bf5 
								
							 
						 
						
							
							
								
								Merge pull request  #864  from ivanbratovic/http-basicauth  
							
							... 
							
							
							
							Implement explicit HTTP "basic" authentication support 
							
						 
						
							2021-11-23 22:48:54 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								3d222ac5f5 
								
							 
						 
						
							
							
								
								fix btoa is not define  
							
							
							
						 
						
							2021-11-23 12:59:48 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								41a6d1b701 
								
							 
						 
						
							
							
								
								Fix parseCertificateInfo possibly in dead loop  
							
							
							
						 
						
							2021-11-08 15:39:17 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Bratović 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34d8984e3a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into http-basicauth  
							
							
							
						 
						
							2021-11-07 17:15:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								c92153c97e 
								
							 
						 
						
							
							
								
								add more debug msg  
							
							
							
						 
						
							2021-11-07 21:00:47 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Bratović 
								
							 
						 
						
							
							
							
							
								
							
							
								179ca232bc 
								
							 
						 
						
							
							
								
								Minor refactor - change variable names and add commas to object definitions  
							
							
							
						 
						
							2021-11-04 10:14:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Bratović 
								
							 
						 
						
							
							
							
							
								
							
							
								0dcb7aed21 
								
							 
						 
						
							
							
								
								Delinting  
							
							
							
						 
						
							2021-11-04 09:50:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Bratović 
								
							 
						 
						
							
							
							
							
								
							
							
								23736549f9 
								
							 
						 
						
							
							
								
								Implement HTTP basic auth feature  
							
							
							
						 
						
							2021-11-04 09:50:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis 
								
							 
						 
						
							
							
							
							
								
							
							
								d7f7dba13f 
								
							 
						 
						
							
							
								
								write some error logs to ./data/error.log  
							
							
							
						 
						
							2021-10-29 18:24:47 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								eb22ad5ffe 
								
							 
						 
						
							
							
								
								[certificate notification] error handling and better msg  
							
							
							
						 
						
							2021-10-27 16:12:18 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								f5f4835b74 
								
							 
						 
						
							
							
								
								[certificate notification] clear sent history if the cert is changed  
							
							
							
						 
						
							2021-10-27 16:03:16 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								44c1b336dc 
								
							 
						 
						
							
							
								
								send certificate notifications in 21, 14, 7 days  
							
							
							
						 
						
							2021-10-27 15:33:15 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								640b6e5b1c 
								
							 
						 
						
							
							
								
								prevent monitor dead for unexpected error  
							
							
							
						 
						
							2021-10-27 14:08:44 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								698a38e773 
								
							 
						 
						
							
							
								
								clear status page cache in a better place  
							
							
							
						 
						
							2021-10-27 11:39:46 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								68d44dd9b3 
								
							 
						 
						
							
							
								
								[steam] do not request if there is no steam api key  
							
							
							
						 
						
							2021-10-18 17:11:41 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								20d59e5a13 
								
							 
						 
						
							
							
								
								fix and move the steam api key to settings page  
							
							
							
						 
						
							2021-10-18 17:02:05 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								ae31eb6ba9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into Revyn112_master  
							
							... 
							
							
							
							# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue 
							
						 
						
							2021-10-18 15:50:35 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								1d63dd9ddd 
								
							 
						 
						
							
							
								
								fix(monitor): safely get status of previous beat if first beat  
							
							
							
						 
						
							2021-10-16 11:28:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								7276f34d90 
								
							 
						 
						
							
							
								
								fix reset-password  
							
							
							
						 
						
							2021-10-16 00:57:26 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								cd211a6be7 
								
							 
						 
						
							
							
								
								[http options] fine tune  
							
							
							
						 
						
							2021-10-15 18:36:40 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								4e71ab7406 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/add-support-for-method-body-and-headers  
							
							
							
						 
						
							2021-10-15 16:07:05 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								3b74b727f2 
								
							 
						 
						
							
							
								
								[Push Type] fix missing important flag and missing up notification  
							
							
							
						 
						
							2021-10-14 22:32:15 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								5445c2a2ff 
								
							 
						 
						
							
							
								
								fix(monitor): revert unintentional change to comment  
							
							
							
						 
						
							2021-10-10 18:41:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								dc08510e72 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers  
							
							
							
						 
						
							2021-10-10 18:40:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								82131f4dd2 
								
							 
						 
						
							
							
								
								merge conflict  
							
							
							
						 
						
							2021-10-10 13:09:30 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								5137c80c07 
								
							 
						 
						
							
							
								
								fix(monitor): handle empty headers  
							
							
							
						 
						
							2021-10-09 21:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								56ae6f6117 
								
							 
						 
						
							
							
								
								fix demoMode export  
							
							
							
						 
						
							2021-10-10 02:36:20 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								5c89562650 
								
							 
						 
						
							
							
								
								not allow lower than 20s for demo mode  
							
							
							
						 
						
							2021-10-10 02:23:27 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								d71d27220b 
								
							 
						 
						
							
							
								
								fix(edit-monitor): store headers as JSON  
							
							
							
						 
						
							2021-10-09 12:42:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								fba4f86552 
								
							 
						 
						
							
							
								
								Merge branch 'master' into feature/add-support-for-method-body-and-headers  
							
							
							
						 
						
							2021-10-09 12:35:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								a15e9077fc 
								
							 
						 
						
							
							
								
								[status page] clear cache if it is an important beat  
							
							
							
						 
						
							2021-10-09 17:04:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								ec4b7e4064 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers  
							
							
							
						 
						
							2021-10-07 18:22:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								e5f6d7f047 
								
							 
						 
						
							
							
								
								slack and rocket.chat use the primary base url  
							
							... 
							
							
							
							env var to show time logger 
							
						 
						
							2021-10-07 17:39:58 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bert Verhelst 
								
							 
						 
						
							
							
							
							
								
							
							
								3f0b85e5a8 
								
							 
						 
						
							
							
								
								feat(http-requests): add support for methods, body and headers for http  
							
							
							
						 
						
							2021-10-02 16:48:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed4ac9494 
								
							 
						 
						
							
							
								
								add Push-based monitoring ( #279 )  
							
							
							
						 
						
							2021-10-01 00:09:43 +08:00