Louis Lam
							
						 | 
						
							
							
							
							
								
							
								e9bf02fc2c
								
							
								
							
						 | 
						
							
							
								
								Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
							
							
							
							
							
							
							
							# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js 
							
						 | 
						
							2023-11-25 03:25:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f28dccf4e1
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request from GHSA-v4v2-8h88-65qj
							
							
							
							
							
						 | 
						
							2023-11-24 17:18:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Nickson
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8a92054c2b
								
									
								
							
								
							
						 | 
						
							
							
								
								Added JSDoc to ESLint (#3529)
							
							
							
							
							
							
							
							* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com> 
							
						 | 
						
							2023-08-11 15:46:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
							
							
								
							
								afadfe32d5
								
							
								
							
						 | 
						
							
							
								
								Trim
							
							
							
							
							
						 | 
						
							2023-02-04 17:03:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
							
							
								
							
								5f2affb38c
								
							
								
							
						 | 
						
							
							
								
								Relocate and fix jsesc issue
							
							
							
							
							
						 | 
						
							2023-02-04 16:58:39 +08:00 |