Louis Lam 
							
						 
					 
					
						
						
							
						
						0cf395dfc3 
					 
					
						
						
							
							Fix merge issue  
						
						
						
						
					 
					
						2022-05-14 14:06:35 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						749ca6f4a8 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature-improve-status-styling  
						
						... 
						
						
						
						# Conflicts:
#	src/components/HeartbeatBar.vue
#	src/components/PublicGroupList.vue 
						
						
					 
					
						2022-05-14 14:05:28 +08:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						ef73af391f 
					 
					
						
						
							
							added option for ntlm authorization  
						
						
						
						
					 
					
						2022-05-13 12:58:23 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						44f6fca945 
					 
					
						
						
							
							added finally to close connection pool  
						
						
						
						
					 
					
						2022-05-13 09:34:31 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						23ce7c6623 
					 
					
						
						
							
							started db update script  
						
						
						
						
					 
					
						2022-05-13 09:06:41 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						c346ea7864 
					 
					
						
						
							
							updated name on export  
						
						
						
						
					 
					
						2022-05-13 08:57:06 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						f0ad32a252 
					 
					
						
						
							
							merged  
						
						
						
						
					 
					
						2022-05-13 08:41:31 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						5720017fb4 
					 
					
						
						
							
							updated name on import  
						
						
						
						
					 
					
						2022-05-13 08:40:46 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						b7dc8e3ef8 
					 
					
						
						
							
							started ui update  
						
						
						
						
					 
					
						2022-05-13 07:22:52 -05:00 
						 
				 
			
				
					
						
							
							
								sur.la.route 
							
						 
					 
					
						
						
							
						
						5bba19f866 
					 
					
						
						
							
							updated format  
						
						... 
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com > 
						
						
					 
					
						2022-05-12 19:54:12 -05:00 
						 
				 
			
				
					
						
							
							
								sur.la.route 
							
						 
					 
					
						
						
							
						
						e198f2f1ab 
					 
					
						
						
							
							updated format  
						
						... 
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com > 
						
						
					 
					
						2022-05-12 19:54:02 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						f91e5b98f9 
					 
					
						
						
							
							[empty commit] pull request for Add NTML Auth Option for HTTP  
						
						
						
						
					 
					
						2022-05-12 13:23:41 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						87f933df4f 
					 
					
						
						
							
							added sqlserver monitor  
						
						
						
						
					 
					
						2022-05-12 12:48:03 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Pickering 
							
						 
					 
					
						
						
							
						
						332b9ab248 
					 
					
						
						
							
							[empty commit] pull request for Add SQLServer Monitor  
						
						
						
						
					 
					
						2022-05-12 10:39:12 -05:00 
						 
				 
			
				
					
						
							
							
								Domingos Panta 
							
						 
					 
					
						
						
							
						
						7cc89979f0 
					 
					
						
						
							
							Moving change from axios interceptor to specific request.  
						
						
						
						
					 
					
						2022-05-12 15:52:21 +01:00 
						 
				 
			
				
					
						
							
							
								Sascha Kruse 
							
						 
					 
					
						
						
							
						
						398ecb7666 
					 
					
						
						
							
							add radius check  
						
						
						
						
					 
					
						2022-05-12 15:21:13 +02:00 
						 
				 
			
				
					
						
							
							
								Domingos Panta 
							
						 
					 
					
						
						
							
						
						668e97c5a9 
					 
					
						
						
							
							fix: lint errors.  
						
						
						
						
					 
					
						2022-05-12 13:39:10 +01:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						90473e7924 
					 
					
						
						
							
							Merge branch 'louislam:master' into bulgarian  
						
						
						
						
					 
					
						2022-05-12 13:34:19 +03:00 
						 
				 
			
				
					
						
							
							
								Domingos Panta 
							
						 
					 
					
						
						
							
						
						fdd781b081 
					 
					
						
						
							
							Added a link to the home page on the lists of actions.  
						
						... 
						
						
						
						s new link was necessary to prevent a loop when the user tries to access a unknown resource, like status/123, and was redirected to /page-not-found. In this case going back to the last page would be /status/123 which does not exists. 
						
						
					 
					
						2022-05-11 17:58:52 +01:00 
						 
				 
			
				
					
						
							
							
								Domingos Panta 
							
						 
					 
					
						
						
							
						
						373bd9b962 
					 
					
						
						
							
							Added response interceptor to axios response.  
						
						... 
						
						
						
						This interceptor checks for response code 404 and redicts the user if that is the case. 
						
						
					 
					
						2022-05-11 17:56:31 +01:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						66971deaf4 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url  
						
						
						
						
					 
					
						2022-05-11 00:51:42 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						59be9bb971 
					 
					
						
						
							
							working  
						
						
						
						
					 
					
						2022-05-11 00:51:11 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8077744c60 
					 
					
						
						
							
							Merge pull request  #1604  from c-w/fix-apprise-zulip  
						
						... 
						
						
						
						Fix apprise integration for Zulip Streams 
						
						
					 
					
						2022-05-11 00:47:50 +08:00 
						 
				 
			
				
					
						
							
							
								Jordan Bertasso 
							
						 
					 
					
						
						
							
						
						c5faf709b8 
					 
					
						
						
							
							Merge branch 'master' into fix-1448-discord-service-url  
						
						
						
						
					 
					
						2022-05-10 22:53:55 +10:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						7da9f139c1 
					 
					
						
						
							
							Bug fix  
						
						
						
						
					 
					
						2022-05-09 21:10:12 +02:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						7acbfd2474 
					 
					
						
						
							
							eslint fixes too much  
						
						
						
						
					 
					
						2022-05-09 21:05:10 +02:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						9f493bbec7 
					 
					
						
						
							
							clone master branch  
						
						
						
						
					 
					
						2022-05-09 21:02:29 +02:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						42f931f6cf 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2022-05-09 10:28:14 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						5bf58cc6c4 
					 
					
						
						
							
							Merge pull request  #1595  from Saibamen/fix_eslint  
						
						... 
						
						
						
						Fix ESLint warnings and errors 
						
						
					 
					
						2022-05-09 13:55:08 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						d344914ca0 
					 
					
						
						
							
							Update docker-compose.yml  
						
						
						
						
					 
					
						2022-05-09 13:47:19 +08:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						2fe5c090aa 
					 
					
						
						
							
							small fixes  
						
						
						
						
					 
					
						2022-05-08 20:50:08 +02:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						ed218e73bb 
					 
					
						
						
							
							UI improvements  
						
						
						
						
					 
					
						2022-05-08 20:03:24 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						201a25c659 
					 
					
						
						
							
							Draft  
						
						
						
						
					 
					
						2022-05-09 00:26:49 +08:00 
						 
				 
			
				
					
						
							
							
								Clemens Wolff 
							
						 
					 
					
						
						
							
						
						b680371746 
					 
					
						
						
							
							Make apprise notification title configurable in UI  
						
						
						
						
					 
					
						2022-05-07 11:00:57 -04:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						e488e2dc0a 
					 
					
						
						
							
							Merge pull request  #1119  from jensneuber/uptime-badges  
						
						... 
						
						
						
						Add badges 
						
						
					 
					
						2022-05-07 13:44:20 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						4e3258579d 
					 
					
						
						
							
							Merge branch 'master' into uptime-badges  
						
						... 
						
						
						
						# Conflicts:
#	server/util-server.js 
						
						
					 
					
						2022-05-07 13:26:47 +08:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						aa8ea6d398 
					 
					
						
						
							
							Update bg-BG.js ( #1617 )  
						
						... 
						
						
						
						Translation Fixes 
						
						
					 
					
						2022-05-07 13:01:06 +08:00 
						 
				 
			
				
					
						
							
							
								Aram Akhavan 
							
						 
					 
					
						
						
							
						
						cd3fbc80b4 
					 
					
						
						
							
							Add first parameter back to logging in api router  
						
						
						
						
					 
					
						2022-05-06 16:05:24 -07:00 
						 
				 
			
				
					
						
							
							
								Aram Akhavan 
							
						 
					 
					
						
						
							
						
						bb7d67f717 
					 
					
						
						
							
							Apply suggestions from code review  
						
						... 
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com > 
						
						
					 
					
						2022-05-06 09:58:05 -07:00 
						 
				 
			
				
					
						
							
							
								Karel Krýda 
							
						 
					 
					
						
						
							
						
						9a35386841 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2022-05-06 11:24:21 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8b0813ceff 
					 
					
						
						
							
							Fix   #1596  hopefully  
						
						
						
						
					 
					
						2022-05-06 14:52:09 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						91178ce6a5 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
						
					 
					
						2022-05-06 14:41:46 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						429ad384d0 
					 
					
						
						
							
							Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()  
						
						
						
						
					 
					
						2022-05-06 14:41:34 +08:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						24e52726b2 
					 
					
						
						
							
							Merge branch 'louislam:master' into bulgarian  
						
						
						
						
					 
					
						2022-05-05 23:03:11 +03:00 
						 
				 
			
				
					
						
							
							
								MrEddX 
							
						 
					 
					
						
						
							
						
						e0a0a5db4c 
					 
					
						
						
							
							Update bg-BG.js  
						
						... 
						
						
						
						Translation Fixes 
						
						
					 
					
						2022-05-05 22:46:34 +03:00 
						 
				 
			
				
					
						
							
							
								OidaTiftla 
							
						 
					 
					
						
						
							
						
						93050208bb 
					 
					
						
						
							
							Merge database changes into single patch file  
						
						
						
						
					 
					
						2022-05-05 16:01:19 +02:00 
						 
				 
			
				
					
						
							
							
								OidaTiftla 
							
						 
					 
					
						
						
							
						
						98ee9caf2c 
					 
					
						
						
							
							Add variable for currentTime  
						
						... 
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com > 
						
						
					 
					
						2022-05-05 15:55:33 +02:00 
						 
				 
			
				
					
						
							
							
								OidaTiftla 
							
						 
					 
					
						
						
							
						
						8e99cbf426 
					 
					
						
						
							
							Merge branch 'master' into introduce-resend-interval  
						
						
						
						
					 
					
						2022-05-04 22:58:40 +02:00 
						 
				 
			
				
					
						
							
							
								Greg Smith 
							
						 
					 
					
						
						
							
						
						cbfecab850 
					 
					
						
						
							
							switch to the more-up-to-date esm-wallaby  
						
						... 
						
						
						
						https://github.com/wallabyjs/esm  
					
						2022-05-04 15:45:18 +09:30 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						25cc54bf72 
					 
					
						
						
							
							Try to give more time for axios-cached-dns-resolve test  
						
						
						
						
					 
					
						2022-05-04 13:24:18 +08:00