Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								b4ffcc5555 
								
							 
						 
						
							
							
								
								Added JSDoc  
							
							
							
						 
						
							2022-04-30 15:50:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								7532acc95d 
								
							 
						 
						
							
							
								
								Resolve conflicts  
							
							
							
						 
						
							2022-04-30 14:33:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								ed84e56a85 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin_kuma/master'  
							
							... 
							
							
							
							# Conflicts:
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	src/components/MonitorList.vue
#	src/components/PingChart.vue
#	src/icon.js
#	src/pages/DashboardHome.vue
#	src/pages/StatusPage.vue
#	src/router.js
#	src/util.js 
							
						 
						
							2022-04-30 13:40:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								60538036c6 
								
							 
						 
						
							
							
								
								[ #1108 ] Change "true" to "up"  
							
							
							
						 
						
							2022-04-28 23:44:08 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								0ba5d031d0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into push-status-param  
							
							... 
							
							
							
							# Conflicts:
#	server/routers/api-router.js 
							
						 
						
							2022-04-28 23:34:51 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aram Akhavan 
								
							 
						 
						
							
							
							
							
								
							
							
								39df4eea92 
								
							 
						 
						
							
							
								
								Ssynchronize push monitor heartbeats to api calls  
							
							... 
							
							
							
							Includes a 1s buffer time to allow the push url to be called before the monitor is checked 
							
						 
						
							2022-04-26 13:48:44 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matthew Nickson 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d04befc1f 
								
							 
						 
						
							
							
								
								Add JSDoc to server/routers/*  
							
							... 
							
							
							
							Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com> 
							
						 
						
							2022-04-21 16:43:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								e103ac8335 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/louislam/uptime-kuma  into uptime-badges  
							
							
							
						 
						
							2022-04-20 10:10:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								29d2d95c71 
								
							 
						 
						
							
							
								
								Merge branch '1.14.X'  
							
							... 
							
							
							
							# Conflicts:
#	package.json
#	server/server.js 
							
						 
						
							2022-04-19 16:43:13 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								919393cac9 
								
							 
						 
						
							
							
								
								Partially change the server core into a class, remove all require("./server")  #1520  
							
							
							
						 
						
							2022-04-19 15:38:59 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								8d8c38b1a8 
								
							 
						 
						
							
							
								
								Allow unused vars in args and fix more eslint issues  
							
							
							
						 
						
							2022-04-17 01:39:49 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								94770cf865 
								
							 
						 
						
							
							
								
								Resolve log message null reference  
							
							
							
						 
						
							2022-04-12 16:57:22 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								c4e74c9943 
								
							 
						 
						
							
							
								
								Render <StatusPage> if domain matched  
							
							
							
						 
						
							2022-04-06 22:43:22 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								aef0a66205 
								
							 
						 
						
							
							
								
								[Status Page] Simplify show tags logic  
							
							
							
						 
						
							2022-03-18 17:56:46 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								b49e5d5c39 
								
							 
						 
						
							
							
								
								The SQL query to determine if the monitor is under maintenance is now in its own method.  
							
							
							
						 
						
							2022-01-25 19:07:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								e7b2832967 
								
							 
						 
						
							
							
								
								The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones  
							
							
							
						 
						
							2022-01-24 22:33:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								5fda1f0f59 
								
							 
						 
						
							
							
								
								minor fixes (missing commas, spaces, translations)  
							
							
							
						 
						
							2022-01-23 20:33:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karel Krýda 
								
							 
						 
						
							
							
							
							
								
							
							
								0d3414c6d6 
								
							 
						 
						
							
							
								
								A complete maintenance planning system has been created  
							
							
							
						 
						
							2022-01-23 15:22:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f00ec4dfef 
								
							 
						 
						
							
							
								
								PR feedback: remove spaces in parenthesis  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2022-01-05 15:26:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								43f8fc701c 
								
							 
						 
						
							
							
								
								PR feedback: remove spaces in parenthesis  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2022-01-05 15:26:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								499042504f 
								
							 
						 
						
							
							
								
								PR feedback: remove spaces in parenthesis  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2022-01-05 15:26:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								faf6719e7c 
								
							 
						 
						
							
							
								
								PR feedback: remove spaces in parenthesis  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2022-01-05 15:25:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a9d264ccfc 
								
							 
						 
						
							
							
								
								PR feedback: remove spaces in comments  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2022-01-05 15:25:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								df8f93f0c2 
								
							 
						 
						
							
							
								
								clean uptime percentage display  
							
							
							
						 
						
							2022-01-05 11:48:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								6acc9546a0 
								
							 
						 
						
							
							
								
								PR feedback + remove redundant code + add a test  
							
							
							
						 
						
							2022-01-04 16:00:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								f455e3a454 
								
							 
						 
						
							
							
								
								add shields.io 'style' parameter  
							
							
							
						 
						
							2022-01-04 13:43:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								7abbf421d0 
								
							 
						 
						
							
							
								
								PR feedback  
							
							
							
						 
						
							2022-01-04 12:23:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								3625915a85 
								
							 
						 
						
							
							
								
								add ping, status badge  
							
							
							
						 
						
							2022-01-04 12:21:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								d74404e106 
								
							 
						 
						
							
							
								
								minor fixes  
							
							
							
						 
						
							2022-01-03 16:23:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								1c5bce8afa 
								
							 
						 
						
							
							
								
								a little documentation  
							
							
							
						 
						
							2022-01-03 16:04:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Neuber 
								
							 
						 
						
							
							
							
							
								
							
							
								35360e2069 
								
							 
						 
						
							
							
								
								add badges  
							
							
							
						 
						
							2022-01-03 15:48:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakub Blažej 
								
							 
						 
						
							
							
							
							
								
							
							
								3d002b3ce9 
								
							 
						 
						
							
							
								
								add status boolean parameter to push monitor  
							
							
							
						 
						
							2021-12-25 20:25:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andreas Brett 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								38f8a8ac2f 
								
							 
						 
						
							
							
								
								Merge branch 'louislam:master' into logging  
							
							
							
						 
						
							2021-12-10 17:21:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								d4bfe57b79 
								
							 
						 
						
							
							
								
								minor: improve formatting  
							
							
							
						 
						
							2021-12-08 15:04:18 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								dcc91d6c72 
								
							 
						 
						
							
							
								
								Fix   #922  
							
							
							
						 
						
							2021-12-08 14:59:59 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andreas Brett 
								
							 
						 
						
							
							
							
							
								
							
							
								e5913c5abc 
								
							 
						 
						
							
							
								
								separate log functions  
							
							
							
						 
						
							2021-11-15 17:52:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andreas Brett 
								
							 
						 
						
							
							
							
							
								
							
							
								bdcdf47e52 
								
							 
						 
						
							
							
								
								introduce consistent logging  
							
							
							
						 
						
							2021-11-11 12:31:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jasper Miller-Waugh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5d6410caf 
								
							 
						 
						
							
							
								
								Apply formatting suggestions from code review  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2021-11-03 11:46:53 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jasper Miller-Waugh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								12ef9f39c5 
								
							 
						 
						
							
							
								
								Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.  
							
							... 
							
							
							
							Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the  tagsVisible setting in the database to fix. 
							
						 
						
							2021-11-01 13:23:46 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jasper Miller-Waugh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74688e69aa 
								
							 
						 
						
							
							
								
								Remove debug statement in server/routers/api-router.js  
							
							... 
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 
						
							2021-10-30 21:16:10 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jasper Miller-Waugh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b32bfb3ff1 
								
							 
						 
						
							
							
								
								Added toggle for tag visibility  
							
							
							
						 
						
							2021-10-30 21:16:10 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jasper Miller-Waugh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								348c5ec995 
								
							 
						 
						
							
							
								
								Match lint settings  
							
							
							
						 
						
							2021-10-30 21:16:10 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jasper Miller-Waugh 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e6d945095 
								
							 
						 
						
							
							
								
								Most hacked in POC  
							
							
							
						 
						
							2021-10-30 21:16:10 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								3b74b727f2 
								
							 
						 
						
							
							
								
								[Push Type] fix missing important flag and missing up notification  
							
							
							
						 
						
							2021-10-14 22:32:15 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Louis Lam 
								
							 
						 
						
							
							
							
							
								
							
							
								5ff9a64e5e 
								
							 
						 
						
							
							
								
								[Push Type] Fix missing duration calculation ( #685 )  
							
							
							
						 
						
							2021-10-14 14:42:34 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								7fa1cb83af 
								
							 
						 
						
							
							
								
								[push type] add ping parameter  
							
							
							
						 
						
							2021-10-01 16:43:11 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								8d5eaaf8a7 
								
							 
						 
						
							
							
								
								minor  
							
							
							
						 
						
							2021-10-01 00:26:27 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								1ed4ac9494 
								
							 
						 
						
							
							
								
								add Push-based monitoring ( #279 )  
							
							
							
						 
						
							2021-10-01 00:09:43 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Adam Stachowicz 
								
							 
						 
						
							
							
							
							
								
							
							
								f6a984b671 
								
							 
						 
						
							
							
								
								start-server-dev.  Fixes   #460  
							
							
							
						 
						
							2021-09-23 12:45:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								fe0fc63843 
								
							 
						 
						
							
							
								
								[status page] send uptime  
							
							
							
						 
						
							2021-09-22 15:10:08 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								8c7ee94769 
								
							 
						 
						
							
							
								
								add modified apicache library with disabling client cache  
							
							
							
						 
						
							2021-09-22 00:58:22 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								5f6aa32844 
								
							 
						 
						
							
							
								
								fix store/fetch status page config  
							
							
							
						 
						
							2021-09-20 20:44:07 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								7ee98d989c 
								
							 
						 
						
							
							
								
								[status page] implement rest api for heartbeat  
							
							
							
						 
						
							2021-09-19 23:24:51 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								512ff09cca 
								
							 
						 
						
							
							
								
								set entry page  
							
							
							
						 
						
							2021-09-15 20:40:26 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								e8f4fabcd0 
								
							 
						 
						
							
							
								
								[status page] crop and resize logo  
							
							
							
						 
						
							2021-09-15 18:28:48 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								db05b506f3 
								
							 
						 
						
							
							
								
								[status page] checkpoint  
							
							
							
						 
						
							2021-09-15 14:34:30 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								afe91078c4 
								
							 
						 
						
							
							
								
								[status page] checkpoint  
							
							
							
						 
						
							2021-09-14 23:27:11 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									LouisLam 
								
							 
						 
						
							
							
							
							
								
							
							
								f9311e4e7f 
								
							 
						 
						
							
							
								
								[status page]  
							
							
							
						 
						
							2021-09-14 14:55:45 +08:00