Louis Lam
							
						 
					 | 
					
						
						
							
						
						04e22f17a9
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into christopherpickering_master
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	src/languages/en.js 
						
						
					 | 
					
						2022-06-11 20:59:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wooferz
							
						 
					 | 
					
						
						
							
						
						aa398948da
					 | 
					
						
						
							
							Merge branch 'louislam:master' into patch-1
						
						
						
						
						
						
					 | 
					
						2022-06-11 09:41:03 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						11243a6ca1
					 | 
					
						
						
							
							Merge pull request #1222 from NETivism/issue-1201
						
						
						
						
						
						
						
						Show some pure text body in notification when keyword not found 
						
						
					 | 
					
						2022-06-09 19:33:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wooferz
							
						 
					 | 
					
						
						
							
						
						54548e34ed
					 | 
					
						
						
							
							Added label to status badge
						
						
						
						
						
						
					 | 
					
						2022-06-08 20:05:10 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						2c0180f323
					 | 
					
						
						
							
							Fix: Fix error when status page desc. is null
						
						
						
						
						
						
					 | 
					
						2022-06-07 14:57:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						4fdaa1abb6
					 | 
					
						
						
							
							[Push API] Response 404 if error, fix #1721
						
						
						
						
						
						
					 | 
					
						2022-06-06 22:40:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						cc258dce14
					 | 
					
						
						
							
							Merge pull request #1674 from philippdormann/feature/ntfy-support
						
						
						
						
						
						
						
						feat: ntfy push support 
						
						
					 | 
					
						2022-06-06 21:52:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						a707b51053
					 | 
					
						
						
							
							Page Loading Speed Optimization (#1711)
						
						
						
						
						
						
						
						* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB 
						
						
					 | 
					
						2022-06-05 23:43:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						091158cfe7
					 | 
					
						
						
							
							[Status Page] Preload data
						
						
						
						
						
						
					 | 
					
						2022-06-01 13:05:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						e4ad8cbfc8
					 | 
					
						
						
							
							Remove unused variables
						
						
						
						
						
						
					 | 
					
						2022-05-31 23:06:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						a674caa520
					 | 
					
						
						
							
							[Status Page] Add og meta tags
						
						
						
						
						
						
					 | 
					
						2022-05-31 22:53:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Karel Krýda
							
						 
					 | 
					
						
						
							
						
						fa777c5bc0
					 | 
					
						
						
							
							Update server/server.js
						
						
						
						
						
						
						
						Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com> 
						
						
					 | 
					
						2022-05-30 15:32:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Karel Krýda
							
						 
					 | 
					
						
						
							
						
						6d0683b055
					 | 
					
						
						
							
							Update server/routers/api-router.js
						
						
						
						
						
						
						
						Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com> 
						
						
					 | 
					
						2022-05-30 15:32:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Karel Krýda
							
						 
					 | 
					
						
						
							
						
						25262cfb91
					 | 
					
						
						
							
							Update server/model/monitor.js
						
						
						
						
						
						
						
						Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com> 
						
						
					 | 
					
						2022-05-30 15:31:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c095767f4a
					 | 
					
						
						
							
							[Status Page] SSR
						
						
						
						
						
						
					 | 
					
						2022-05-30 15:45:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						ffb7ba176c
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into status-page-inject-html
						
						
						
						
						
						
					 | 
					
						2022-05-30 14:00:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aram Akhavan
							
						 
					 | 
					
						
						
							
						
						ea10d89f51
					 | 
					
						
						
							
							show correct down message for first tick
						
						
						
						
						
						
					 | 
					
						2022-05-28 19:57:45 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						7f46223d68
					 | 
					
						
						
							
							Fix another log.debug call
						
						
						
						
						
						
					 | 
					
						2022-05-28 23:22:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						df4ce811d9
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into kaysond_master
						
						
						
						
						
						
						
						# Conflicts:
#	server/model/monitor.js 
						
						
					 | 
					
						2022-05-28 23:19:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Moritz R
							
						 
					 | 
					
						
						
							
						
						e9e78c26e5
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
						
					 | 
					
						2022-05-27 13:59:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aram Akhavan
							
						 
					 | 
					
						
						
							
						
						ab4edf2092
					 | 
					
						
						
							
							Fix log.debug calls
						
						
						
						
						
						
					 | 
					
						2022-05-26 21:45:56 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Hagen
							
						 
					 | 
					
						
						
							
						
						5830f1e0b5
					 | 
					
						
						
							
							[feat] Adding PagerDuty notification
						
						
						
						
						
						
					 | 
					
						2022-05-25 14:10:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						35b8e89457
					 | 
					
						
						
							
							Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
						
						
						
						
						
						
						
						Added #1059: Allow to specify Resolver Port for DNS Monitor 
						
						
					 | 
					
						2022-05-25 14:59:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DasCanard
							
						 
					 | 
					
						
						
							
						
						f23baf9c22
					 | 
					
						
						
							
							Added Push Monitor to Discord Notifications
						
						
						
						
						
						
					 | 
					
						2022-05-24 23:14:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Dormann
							
						 
					 | 
					
						
						
							
						
						54184350a4
					 | 
					
						
						
							
							fix: missing semicolons
						
						
						
						
						
						
					 | 
					
						2022-05-23 21:13:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Dormann
							
						 
					 | 
					
						
						
							
						
						14dbe7c334
					 | 
					
						
						
							
							clean up + default ntfs.sh server url
						
						
						
						
						
						
					 | 
					
						2022-05-23 21:11:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Dormann
							
						 
					 | 
					
						
						
							
						
						71f031c14e
					 | 
					
						
						
							
							add ntfy support
						
						
						
						
						
						
						
						ref https://github.com/louislam/uptime-kuma/issues/1622 
						
						
					 | 
					
						2022-05-23 10:55:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								c0derMo
							
						 
					 | 
					
						
						
							
						
						32cfd411f8
					 | 
					
						
						
							
							Fixed style & code errors
						
						
						
						
						
						
					 | 
					
						2022-05-19 12:35:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Moritz R
							
						 
					 | 
					
						
						
							
						
						a9f3142cee
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
						
					 | 
					
						2022-05-19 14:24:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						b7ba6330db
					 | 
					
						
						
							
							Feat: Add cert exp. settings
						
						
						
						
						
						
					 | 
					
						2022-05-19 16:49:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sascha Kruse
							
						 
					 | 
					
						
						
							
						
						da99a57560
					 | 
					
						
						
							
							Merge remote-tracking branch 'fxgh/radius-check' into radius-check
						
						
						
						
						
						
					 | 
					
						2022-05-18 15:56:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sascha Kruse
							
						 
					 | 
					
						
						
							
						
						42d68edab0
					 | 
					
						
						
							
							(style) add trailing comma
						
						
						
						
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
						
						
					 | 
					
						2022-05-18 15:55:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sascha Kruse
							
						 
					 | 
					
						
						
							
						
						019d638767
					 | 
					
						
						
							
							Merge remote-tracking branch 'ghupstream/master' into radius-check
						
						
						
						
						
						
					 | 
					
						2022-05-18 15:54:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						7a46b44d25
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into karelkryda_master
						
						
						
						
						
						
						
						# Conflicts:
#	src/components/HeartbeatBar.vue 
						
						
					 | 
					
						2022-05-18 19:49:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						8ede6d888f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
						
						
						
						
						
						
					 | 
					
						2022-05-14 14:37:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						cec0521834
					 | 
					
						
						
							
							[Discord] Fix ping type should no port, update better naming
						
						
						
						
						
						
					 | 
					
						2022-05-14 14:36:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						73b603dd10
					 | 
					
						
						
							
							Merge pull request #1627 from karelkryda/wrong-uptime-for-push
						
						
						
						
						
						
						
						Fixed incorrect uptime calculation for push monitors 
						
						
					 | 
					
						2022-05-14 14:18:19 +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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						87f933df4f
					 | 
					
						
						
							
							added sqlserver monitor
						
						
						
						
						
						
					 | 
					
						2022-05-12 12:48:03 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sascha Kruse
							
						 
					 | 
					
						
						
							
						
						398ecb7666
					 | 
					
						
						
							
							add radius check
						
						
						
						
						
						
					 | 
					
						2022-05-12 15:21:13 +02: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |