Louis Lam 
							
						 
					 
					
						
						
							
						
						869ee8ec50 
					 
					
						
						
							
							Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/auto-test.yml
#	extra/reset-password.js
#	package-lock.json
#	package.json
#	server/routers/status-page-router.js
#	server/server.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
#	src/components/ActionInput.vue
#	src/util.js
#	src/util.ts 
						
						
					 
					
						2023-12-11 02:13:47 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						482049c72b 
					 
					
						
						
							
							Merge pull request from GHSA-88j4-pcx8-q4q3  
						
						 
						
						... 
						
						
						
						* WIP, still need to handle npm run reset-password
* Implement it for "npm run reset-password"
Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js
* Minor 
						
						
					 
					
						2023-12-10 20:40:40 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Adam Stachowicz 
							
						 
					 
					
						
						
							
						
						6875ecdfbf 
					 
					
						
						
							
							Fix warnings ( #3826 )  
						
						 
						
						
						
						
					 
					
						2023-10-03 05:39:17 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						076331bf00 
					 
					
						
						
							
							Uptime calculation improvement and 1-year uptime ( #2750 )  
						
						 
						
						
						
						
					 
					
						2023-09-01 05:19:21 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						fe40d819bd 
					 
					
						
						
							
							Update send403 to sendHttpError  
						
						 
						
						
						
						
					 
					
						2023-07-08 21:34:58 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						3dbd8277f0 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feat/global-status-page-badge  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	.gitignore 
						
						
					 
					
						2023-07-08 21:28:57 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						3439074835 
					 
					
						
						
							
							Feat: Use message to improve errror status code  
						
						 
						
						
						
						
					 
					
						2023-02-09 17:42:02 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sjouke de Vries 
							
						 
					 
					
						
						
							
						
						94b69935fe 
					 
					
						
						
							
							chore(server): remove comments from status-page router  
						
						 
						
						
						
						
					 
					
						2023-01-09 11:16:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sjouke de Vries 
							
						 
					 
					
						
						
							
						
						3f30feaefb 
					 
					
						
						
							
							feat(server): add badge for overall status of status-page  
						
						 
						
						
						
						
					 
					
						2023-01-09 11:04:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						27dbc021b4 
					 
					
						
						
							
							Add standalone manifest.json for each status page.  Close   #1668  
						
						 
						
						
						
						
					 
					
						2022-07-04 21:58:27 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						091158cfe7 
					 
					
						
						
							
							[Status Page] Preload data  
						
						 
						
						
						
						
					 
					
						2022-06-01 13:05:12 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c095767f4a 
					 
					
						
						
							
							[Status Page] SSR  
						
						 
						
						
						
						
					 
					
						2022-05-30 15:45:44 +08:00