Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						daab2a05f5
					 | 
					
						
						
							
							Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
						
						
						
						
						
						
					 | 
					
						2021-10-09 11:13:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						fc8d1e78b6
					 | 
					
						
						
							
							[push type] hide upside down mode, apply primary base url
						
						
						
						
						
						
					 | 
					
						2021-10-08 20:03:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas
							
						 
					 | 
					
						
						
							
						
						db791c880a
					 | 
					
						
						
							
							Don't use then with await.
						
						
						
						
						
						
					 | 
					
						2021-10-08 11:49:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas
							
						 
					 | 
					
						
						
							
						
						dfd63386ba
					 | 
					
						
						
							
							Make PromoSMS actually working
						
						
						
						
						
						
						
						Make PromoSMS actually working and inform on success only when API return 0 
						
						
					 | 
					
						2021-10-08 09:11:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lukas
							
						 
					 | 
					
						
						
							
						
						12b5489eb5
					 | 
					
						
						
							
							PromoSMS as Notification Provider
						
						
						
						
						
						
						
						Add PromoSMS (Polish SMS Gateway) as new notification provider 
						
						
					 | 
					
						2021-10-07 21:56:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						ddad2dcb4a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	src/languages/en.js 
						
						
					 | 
					
						2021-10-08 01:40:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						5b4af550fb
					 | 
					
						
						
							
							Merge branch 'master' into DeeJayPee_master
						
						
						
						
						
						
					 | 
					
						2021-10-08 01:27:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						3a0143ac46
					 | 
					
						
						
							
							[matrix] use encodeURIComponent to handle the url encode
						
						
						
						
						
						
					 | 
					
						2021-10-08 01:11:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						2ce5c28ed4
					 | 
					
						
						
							
							Merge branch 'master' into feature/matrix-notifications
						
						
						
						
						
						
						
						# Conflicts:
#	src/languages/en.js 
						
						
					 | 
					
						2021-10-08 00:59:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						ec4b7e4064
					 | 
					
						
						
							
							Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
						
						
						
						
						
						
					 | 
					
						2021-10-07 18:22:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						e5f6d7f047
					 | 
					
						
						
							
							slack and rocket.chat use the primary base url
						
						
						
						
						
						
						
						env var to show time logger 
						
						
					 | 
					
						2021-10-07 17:39:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						162ef04c41
					 | 
					
						
						
							
							Merge branch 'master' into feature/add-support-for-method-body-and-headers
						
						
						
						
						
						
					 | 
					
						2021-10-06 21:56:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gero Gerke
							
						 
					 | 
					
						
						
							
						
						6bebc623f9
					 | 
					
						
						
							
							UI polish
						
						
						
						
						
						
					 | 
					
						2021-10-05 21:59:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gero Gerke
							
						 
					 | 
					
						
						
							
						
						34b86352f2
					 | 
					
						
						
							
							remove double spaces
						
						
						
						
						
						
					 | 
					
						2021-10-05 21:40:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gero Gerke
							
						 
					 | 
					
						
						
							
						
						99e8a33118
					 | 
					
						
						
							
							escape room characters
						
						
						
						
						
						
					 | 
					
						2021-10-05 21:36:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gero Gerke
							
						 
					 | 
					
						
						
							
						
						d7cc585101
					 | 
					
						
						
							
							Update server/notification-providers/matrix.js
						
						
						
						
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
						
						
					 | 
					
						2021-10-05 20:42:44 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gero Gerke
							
						 
					 | 
					
						
						
							
						
						5decfb9fad
					 | 
					
						
						
							
							Matrix Notifications
						
						
						
						
						
						
					 | 
					
						2021-10-05 20:03:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DeeJayPee
							
						 
					 | 
					
						
						
							
						
						bc4db6c692
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master
						
						
						
						
						
						
					 | 
					
						2021-10-05 19:57:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DeeJayPee
							
						 
					 | 
					
						
						
							
						
						f14a798b2c
					 | 
					
						
						
							
							Fix indentation + typo
						
						
						
						
						
						
					 | 
					
						2021-10-05 19:43:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						550825927c
					 | 
					
						
						
							
							Merge branch 'master' into feature/add-support-for-method-body-and-headers
						
						
						
						
						
						
					 | 
					
						2021-10-05 18:19:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						edad2caf8e
					 | 
					
						
						
							
							return the correct exit code from jest
						
						
						
						
						
						
					 | 
					
						2021-10-05 20:40:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						49720c709c
					 | 
					
						
						
							
							improve the test with a single command only "npm test"
						
						
						
						
						
						
					 | 
					
						2021-10-05 19:13:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						865b721b79
					 | 
					
						
						
							
							Merge pull request #519 from chakflying/improve-certInfo
						
						
						
						
						
						
						
						Feat: Improve Certificate Info Display 
						
						
					 | 
					
						2021-10-05 16:09:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						6b44116245
					 | 
					
						
						
							
							Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
						
						
						
						
						
						
					 | 
					
						2021-10-05 08:54:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						a2a4c70cf5
					 | 
					
						
						
							
							setup jest-puppeteer
						
						
						
						
						
						
					 | 
					
						2021-10-03 18:16:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						3f0b85e5a8
					 | 
					
						
						
							
							feat(http-requests): add support for methods, body and headers for http
						
						
						
						
						
						
					 | 
					
						2021-10-02 16:48:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						13bdfefa9d
					 | 
					
						
						
							
							Feat: Improve Certificaet Info Display
						
						
						
						
						
						
					 | 
					
						2021-10-01 18:56:28 +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
							
						 
					 | 
					
						
						
							
						
						b246c8e0f2
					 | 
					
						
						
							
							Fix 2fa for iOS Google authenticator (#486)
						
						
						
						
						
						
					 | 
					
						2021-10-01 00:23:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						1ed4ac9494
					 | 
					
						
						
							
							add Push-based monitoring (#279)
						
						
						
						
						
						
					 | 
					
						2021-10-01 00:09:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						6eceb4c744
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2021-09-29 17:20:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						3e4154dfb5
					 | 
					
						
						
							
							Fix retry interval affected bug
						
						
						
						
						
						
					 | 
					
						2021-09-29 17:20:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						fbc8828ddc
					 | 
					
						
						
							
							Merge pull request #464 from chakflying/fix-delete-monitor
						
						
						
						
						
						
						
						Fix: clear important beats after deleteMonitor 
						
						
					 | 
					
						2021-09-29 15:39:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						0afa3a2c21
					 | 
					
						
						
							
							Merge branch '1.6.X'
						
						
						
						
						
						
						
						# Conflicts:
#	server/database.js
#	server/server.js 
						
						
					 | 
					
						2021-09-24 19:12:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						662c97dcde
					 | 
					
						
						
							
							Fix: Fix importing tag if tag doesn't exist
						
						
						
						
						
						
					 | 
					
						2021-09-24 14:34:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						7fb55b8875
					 | 
					
						
						
							
							Fixed issues
						
						
						
						
						
						
					 | 
					
						2021-09-23 17:31:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						4786514e9f
					 | 
					
						
						
							
							Merge branch 'louislam:master' into import-export
						
						
						
						
						
						
					 | 
					
						2021-09-23 17:24:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						32c9dfbb31
					 | 
					
						
						
							
							Fix: clear important beats after deleteMonitor
						
						
						
						
						
						
					 | 
					
						2021-09-23 23:21:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						d3d4363031
					 | 
					
						
						
							
							Used compare-version instead of replace
						
						
						
						
						
						
					 | 
					
						2021-09-23 17:15:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Stachowicz
							
						 
					 | 
					
						
						
							
						
						f6a984b671
					 | 
					
						
						
							
							start-server-dev. Fixes #460
						
						
						
						
						
						
					 | 
					
						2021-09-23 12:45:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						23a63213aa
					 | 
					
						
						
							
							Merge branch 'master' into import-export
						
						
						
						
						
						
						
						# Conflicts:
#	server/server.js 
						
						
					 | 
					
						2021-09-23 17:20:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						0a5a6e6a4b
					 | 
					
						
						
							
							[status page] fix monitor order
						
						
						
						
						
						
					 | 
					
						2021-09-22 15:23:58 +08: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
							
						 
					 | 
					
						
						
							
						
						15c00d9158
					 | 
					
						
						
							
							upload logo and expose ./data/upload to url
						
						
						
						
						
						
					 | 
					
						2021-09-21 21:22:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						469e8f6fd6
					 | 
					
						
						
							
							Merge branch 'master' into public-dashboard
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json 
						
						
					 | 
					
						2021-09-21 17:05:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						4591adc05e
					 | 
					
						
						
							
							second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
						
						
						
						
						
						
					 | 
					
						2021-09-21 01:15:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						5f6aa32844
					 | 
					
						
						
							
							fix store/fetch status page config
						
						
						
						
						
						
					 | 
					
						2021-09-20 20:44:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						a8e170f6a8
					 | 
					
						
						
							
							Merge branch 'master' into public-dashboard
						
						
						
						
						
						
						
						# Conflicts:
#	server/server.js 
						
						
					 | 
					
						2021-09-20 18:48:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |