Louis Lam 
							
						 
					 
					
						
						
							
						
						0a5db0cecb 
					 
					
						
						
							
							Fix   #1478  
						
						
						
						
							
						
					 
					
						2022-04-14 10:12:31 +08:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						60b44c2cdd 
					 
					
						
						
							
							Update bg-BG.js  
						
						... 
						
						
						
						Fixed translation. 
						
						
							
						
					 
					
						2022-04-14 09:46:43 +08:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						8c8eeaf627 
					 
					
						
						
							
							Merge branch 'master' into #1059-specify-dns-resolver-port  
						
						
						
						
							
						
					 
					
						2022-04-13 21:24:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						b893d50e45 
					 
					
						
						
							
							Implement specify Port for DNS Monitor  #1059  
						
						... 
						
						
						
						This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
							
						
					 
					
						2022-04-13 21:02:19 +01:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						16b61dba27 
					 
					
						
						
							
							Merge branch 'louislam:master' into bulgarian  
						
						
						
						
							
						
					 
					
						2022-04-13 21:59:53 +03:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2b0c184a88 
					 
					
						
						
							
							Update package-lock  
						
						
						
						
							
						
					 
					
						2022-04-14 01:21:43 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2642e70fc8 
					 
					
						
						
							
							Fix auto test failed due to autocrlf  
						
						
						
						
							
						
					 
					
						2022-04-14 01:20:54 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8d0446dc38 
					 
					
						
						
							
							Add lint as part of test  
						
						
						
						
							
						
					 
					
						2022-04-14 01:20:54 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						3436e26ed4 
					 
					
						
						
							
							Fix styleline, fix css format issues globally  
						
						
						
						
							
						
					 
					
						2022-04-14 01:20:54 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						649f3106e1 
					 
					
						
						
							
							Enforce semicolon, fix format globally  
						
						
						
						
							
						
					 
					
						2022-04-14 01:20:54 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6f72ca481f 
					 
					
						
						
							
							Merge pull request  #1479  from AnnAngela/1.14.0_translation  
						
						... 
						
						
						
						New translation for zh-CN 
						
						
							
						
					 
					
						2022-04-14 00:05:07 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						670ea415b2 
					 
					
						
						
							
							Merge pull request  #1488  from c0derMo/update-german-translation  
						
						... 
						
						
						
						updating german translation 
						
						
							
						
					 
					
						2022-04-14 00:03:53 +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 
						 
				 
			
				
					
						
							
							
								c0derMo 
							
						 
					 
					
						
						
							
						
						f5d006add8 
					 
					
						
						
							
							updating german translation  
						
						
						
						
							
						
					 
					
						2022-04-13 14:45:41 +00:00 
						 
				 
			
				
					
						
							
							
								Moritz R 
							
						 
					 
					
						
						
							
						
						361e44ad6a 
					 
					
						
						
							
							Merge branch 'louislam:master' into master  
						
						
						
						
							
						
					 
					
						2022-04-13 15:58:17 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						4df147786d 
					 
					
						
						
							
							Merge pull request  #1483  from Alexandre-Gliganic/master  
						
						... 
						
						
						
						Add automatic restart for docker-compose.yml 
						
						
							
						
					 
					
						2022-04-12 22:39:29 +08:00 
						 
				 
			
				
					
						
							
							
								Alexandre Gliganic 
							
						 
					 
					
						
						
							
						
						27861f0d14 
					 
					
						
						
							
							Add automatic restart docker-compose.yml  
						
						
						
						
							
						
					 
					
						2022-04-12 16:09:01 +02:00 
						 
				 
			
				
					
						
							
							
								AnnAngela-work 
							
						 
					 
					
						
						
							
						
						5aa747a301 
					 
					
						
						
							
							New translation  
						
						
						
						
							
						
					 
					
						2022-04-12 20:41:25 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						81de2eedfb 
					 
					
						
						
							
							Fix template can contain one tag only, disable vue/require-component-is eslint rule  
						
						
						
						
							
						
					 
					
						2022-04-12 20:23:11 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						4a6d7207ef 
					 
					
						
						
							
							Merge branch 'master' into customstatuspage  
						
						... 
						
						
						
						# Conflicts:
#	src/languages/de-DE.js
#	src/languages/en.js
#	src/pages/StatusPage.vue 
						
						
							
						
					 
					
						2022-04-12 19:39:42 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						4053b9db1f 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
						
							
						
					 
					
						2022-04-12 17:46:24 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						772d009f43 
					 
					
						
						
							
							Merge branch 'master' into fluencydoc_master  
						
						... 
						
						
						
						# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js 
						
						
							
						
					 
					
						2022-04-12 17:44:04 +08:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						ae54d9c011 
					 
					
						
						
							
							Merge branch 'louislam:master' into bulgarian  
						
						
						
						
							
						
					 
					
						2022-04-12 12:37:52 +03:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						5ca606fe99 
					 
					
						
						
							
							Merge pull request  #1141  from marcules/issue/1138  
						
						... 
						
						
						
						Issue/1138 
						
						
							
						
					 
					
						2022-04-12 17:32:52 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6179f6c982 
					 
					
						
						
							
							Merge branch 'master' into issue/1138  
						
						... 
						
						
						
						# Conflicts:
#	server/server.js 
						
						
							
						
					 
					
						2022-04-12 17:15:33 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						94770cf865 
					 
					
						
						
							
							Resolve log message null reference  
						
						
						
						
							
						
					 
					
						2022-04-12 16:57:22 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						9ec29c1bc4 
					 
					
						
						
							
							Add back debug() for safe, but it is marked as deprecated  
						
						
						
						
							
						
					 
					
						2022-04-12 16:37:05 +08: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 
							
						 
					 
					
						
						
							
						
						1ba92d803e 
					 
					
						
						
							
							Update to 1.14.0  
						
						
						
						
							
 
						
					 
					
						2022-04-12 14:17:13 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						45ca3085b2 
					 
					
						
						
							
							Update CONTRIBUTING.md  
						
						
						
						
							
						
					 
					
						2022-04-12 13:53:52 +08:00 
						 
				 
			
				
					
						
							
							
								jordanbertasso 
							
						 
					 
					
						
						
							
						
						0765f05090 
					 
					
						
						
							
							Update Discord tests  
						
						
						
						
							
						
					 
					
						2022-04-12 09:52:16 +10:00 
						 
				 
			
				
					
						
							
							
								jordanbertasso 
							
						 
					 
					
						
						
							
						
						2638d68c97 
					 
					
						
						
							
							Cover dns and steam types in Discord notifs  
						
						
						
						
							
						
					 
					
						2022-04-12 09:52:07 +10:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						e38742a2d0 
					 
					
						
						
							
							[empty commit] pull request for  #1059  
						
						
						
						
							
						
					 
					
						2022-04-11 19:58:31 +01:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						a0d1ae2cce 
					 
					
						
						
							
							Better alignment of monitor list item  
						
						
						
						
							
						
					 
					
						2022-04-11 18:02:18 +08:00 
						 
				 
			
				
					
						
							
							
								jordanbertasso 
							
						 
					 
					
						
						
							
						
						1b1e0f6dd9 
					 
					
						
						
							
							Add Discord tests  
						
						
						
						
							
						
					 
					
						2022-04-10 22:02:30 +10:00 
						 
				 
			
				
					
						
							
							
								jordanbertasso 
							
						 
					 
					
						
						
							
						
						0961c6d9b3 
					 
					
						
						
							
							Check for ping and port type in discord notifs  
						
						
						
						
							
						
					 
					
						2022-04-10 21:45:07 +10:00 
						 
				 
			
				
					
						
							
							
								jordanbertasso 
							
						 
					 
					
						
						
							
						
						ce7d8c38c5 
					 
					
						
						
							
							[empty commit] pull request for issue  #1448  
						
						
						
						
							
						
					 
					
						2022-04-10 21:43:52 +10:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						f030487f7d 
					 
					
						
						
							
							Fix theme color that do not apply to status page with a custom domain  
						
						
						
						
							
						
					 
					
						2022-04-10 13:46:00 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						316e65d35a 
					 
					
						
						
							
							Update to 1.14.0-beta.2  
						
						
						
						
							
 
						
					 
					
						2022-04-10 00:46:34 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						df5ba02f3f 
					 
					
						
						
							
							Merge pull request  #1415  from louislam/status-page-domain  
						
						... 
						
						
						
						[Status Page] Map domain names to status pages 
						
						
							
						
					 
					
						2022-04-10 00:42:31 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c9fa183712 
					 
					
						
						
							
							Manage domain names  
						
						
						
						
							
						
					 
					
						2022-04-10 00:25:27 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						0b9b5102ec 
					 
					
						
						
							
							Minor  
						
						
						
						
							
						
					 
					
						2022-04-09 17:23:22 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c399984b7f 
					 
					
						
						
							
							Improve status page sidebar  
						
						
						
						
							
						
					 
					
						2022-04-09 17:03:10 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						0afa0be5c2 
					 
					
						
						
							
							Merge branch 'master' into status-page-domain  
						
						... 
						
						
						
						# Conflicts:
#	server/database.js 
						
						
							
						
					 
					
						2022-04-09 16:07:09 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6a30dbd71a 
					 
					
						
						
							
							Fix Mattermost when channel is empty  #1468  
						
						
						
						
							
						
					 
					
						2022-04-09 15:44:50 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						a2d9474e85 
					 
					
						
						
							
							Copy some keys from zh-TW to zh-HK  
						
						
						
						
							
						
					 
					
						2022-04-09 14:51:26 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8479e772cd 
					 
					
						
						
							
							Merge pull request  #1463  from JohnnyChiang/update-zh-TW-translation  
						
						... 
						
						
						
						Update zh-TW translation 
						
						
							
						
					 
					
						2022-04-09 14:44:44 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2e50ef0e8f 
					 
					
						
						
							
							Merge pull request  #1450  from AnnAngela/1.14.0-zh_cn  
						
						... 
						
						
						
						1.14.0 translation improvement 
						
						
							
						
					 
					
						2022-04-09 14:40:38 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						4fb2c69dd1 
					 
					
						
						
							
							Merge pull request  #1461  from louislam/proxy-improvement  
						
						... 
						
						
						
						Proxy Improvements 
						
						
							
						
					 
					
						2022-04-09 13:54:28 +08:00