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 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						ef73af391f 
					 
					
						
						
							
							added option for ntlm authorization  
						
						
						
						
					 
					
						2022-05-13 12:58:23 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						23ce7c6623 
					 
					
						
						
							
							started db update script  
						
						
						
						
					 
					
						2022-05-13 09:06:41 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						87f933df4f 
					 
					
						
						
							
							added sqlserver monitor  
						
						
						
						
					 
					
						2022-05-12 12:48:03 -05:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2a248ad73f 
					 
					
						
						
							
							Change mqtt_topic from VARCHAR to TEXT  
						
						
						
						
					 
					
						2022-04-17 19:56:47 +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 
							
						 
					 
					
						
						
							
						
						8eb83394f7 
					 
					
						
						
							
							Refine UI/UX for custom css / footer text. Add switch for show/hide powered by  
						
						
						
						
					 
					
						2022-04-17 14:53:13 +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 
							
						 
					 
					
						
						
							
						
						70311f7a5a 
					 
					
						
						
							
							Add an option to enable/disable the domain name expiry notification  #1364  
						
						
						
						
					 
					
						2022-04-05 21:27:50 +08: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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						72ce28a541 
					 
					
						
						
							
							Migrate status page table  
						
						
						
						
					 
					
						2022-03-08 14:33:35 +08: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 
							
						 
					 
					
						
						
							
						
						1c8407a433 
					 
					
						
						
							
							[MQTT] Use existing fields instead of creating new ones (UI)  
						
						
						
						
					 
					
						2022-01-13 11:36:55 +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 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						72a59ce7a4 
					 
					
						
						
							
							add status page table  
						
						
						
						
					 
					
						2021-12-27 18:54:48 +08:00 
						 
				 
			
				
					
						
							
							
								Tarun Singh 
							
						 
					 
					
						
						
							
						
						3f5133d1ba 
					 
					
						
						
							
							Added authentication logic  
						
						
						
						
					 
					
						2021-11-16 20:44:10 -05:00 
						 
				 
			
				
					
						
							
							
								Tarun Singh 
							
						 
					 
					
						
						
							
						
						3721d11259 
					 
					
						
						
							
							changed table column names for more specifity  
						
						
						
						
					 
					
						2021-11-09 18:53:00 -05: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ć 
							
						 
					 
					
						
						
							
						
						665c263c03 
					 
					
						
						
							
							Add db migrations for new basic auth fields  
						
						
						
						
					 
					
						2021-11-04 09:50:10 +01:00 
						 
				 
			
				
					
						
							
							
								Tarun Singh 
							
						 
					 
					
						
						
							
						
						670754b697 
					 
					
						
						
							
							added MQTT monitor type  
						
						
						
						
					 
					
						2021-11-03 21:46:43 -04:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						44c1b336dc 
					 
					
						
						
							
							send certificate notifications in 21, 14, 7 days  
						
						
						
						
					 
					
						2021-10-27 15:33:15 +08:00 
						 
				 
			
				
					
						
							
							
								Andreas Brett 
							
						 
					 
					
						
						
							
						
						acc2995d86 
					 
					
						
						
							
							invalidate used token  
						
						
						
						
					 
					
						2021-10-19 00:42:33 +02: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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								Denis Freund 
							
						 
					 
					
						
						
							
						
						b67b4d5afd 
					 
					
						
						
							
							add steam gameserver for monitoring  
						
						
						
						
					 
					
						2021-09-27 11:17:57 +02:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						5f533b9091 
					 
					
						
						
							
							[status page] fix wrong foreign key  
						
						
						
						
					 
					
						2021-09-22 18:50:20 +08:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						fd95d41d9f 
					 
					
						
						
							
							[status page] many update and save group list  
						
						
						
						
					 
					
						2021-09-19 19:04:51 +08:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						2955abb5d9 
					 
					
						
						
							
							[status page] create incident  
						
						
						
						
					 
					
						2021-09-16 22:48:28 +08:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						392f8275b3 
					 
					
						
						
							
							Merge branch 'master' into public-dashboard  
						
						... 
						
						
						
						# Conflicts:
#	server/database.js 
						
						
					 
					
						2021-09-16 16:53:54 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						72783fd94c 
					 
					
						
						
							
							Merge pull request  #380  from No0Vad/retry-heartbeat-interval  
						
						... 
						
						
						
						Added support for a retry interval to monitors 
						
						
					 
					
						2021-09-16 00:21:53 +08:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						b2ff6b6098 
					 
					
						
						
							
							update ignore files and delete demo db  
						
						
						
						
					 
					
						2021-09-16 00:12:39 +08:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						9902c181bc 
					 
					
						
						
							
							Merge branch 'master' into public-dashboard  
						
						... 
						
						
						
						# Conflicts:
#	src/components/MonitorList.vue
#	src/icon.js 
						
						
					 
					
						2021-09-14 15:05:04 +08:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						6e3a904aaa 
					 
					
						
						
							
							WIP: Add tags functionality  
						
						... 
						
						
						
						WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version 
						
						
					 
					
						2021-09-13 14:12:11 +08:00 
						 
				 
			
				
					
						
							
							
								No0Vad 
							
						 
					 
					
						
						
							
						
						91ee39ec60 
					 
					
						
						
							
							Merge branch 'master' into retry-heartbeat-interval  
						
						
						
						
					 
					
						2021-09-13 00:19:51 +02:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						e205adfd7b 
					 
					
						
						
							
							[status page] developing  
						
						
						
						
					 
					
						2021-09-13 02:26:45 +08:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						f47f7758f9 
					 
					
						
						
							
							Merge branch 'master' into public-dashboard  
						
						... 
						
						
						
						# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js 
						
						
					 
					
						2021-09-13 01:09:01 +08:00 
						 
				 
			
				
					
						
							
							
								No0Vad 
							
						 
					 
					
						
						
							
						
						f8f9f59464 
					 
					
						
						
							
							Added support for a retry interval to monitors  
						
						... 
						
						
						
						If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again. 
						
						
					 
					
						2021-09-11 18:54:55 +02:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						934685637a 
					 
					
						
						
							
							[Status Page] WIP: Checkpoint  
						
						
						
						
					 
					
						2021-09-11 23:43:07 +08:00 
						 
				 
			
				
					
						
							
							
								Ponkhy 
							
						 
					 
					
						
						
							
						
						295ccba44b 
					 
					
						
						
							
							Adjusted for new db patch management  
						
						
						
						
					 
					
						2021-09-11 16:37:33 +02:00 
						 
				 
			
				
					
						
							
							
								Ponkhy 
							
						 
					 
					
						
						
							
						
						8cd5bad44c 
					 
					
						
						
							
							Merge branch 'master' into 2fa  
						
						
						
						
					 
					
						2021-09-11 16:32:11 +02:00 
						 
				 
			
				
					
						
							
							
								Ponkhy 
							
						 
					 
					
						
						
							
						
						14b7688b70 
					 
					
						
						
							
							Added NOT NULL to twofa_status  
						
						
						
						
					 
					
						2021-09-11 00:13:05 +02:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						08de0090dc 
					 
					
						
						
							
							add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0  
						
						
						
						
					 
					
						2021-09-10 17:23:45 +08:00 
						 
				 
			
				
					
						
							
							
								Ponkhy 
							
						 
					 
					
						
						
							
						
						403202d4d4 
					 
					
						
						
							
							Added simple TOTP Two Factor Authentication  
						
						
						
						
					 
					
						2021-09-09 21:10:31 +02:00 
						 
				 
			
				
					
						
							
							
								LouisLam 
							
						 
					 
					
						
						
							
						
						0b1d0d22ff 
					 
					
						
						
							
							add indexes, improve queries  
						
						
						
						
					 
					
						2021-09-09 12:43:18 +08:00 
						 
				 
			
				
					
						
							
							
								Ponkhy 
							
						 
					 
					
						
						
							
						
						b95404b6e0 
					 
					
						
						
							
							Fixed suggestions  
						
						
						
						
					 
					
						2021-09-06 09:45:52 +02:00