| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Denis Freund | b67b4d5afd | add steam gameserver for monitoring | 2021-09-27 11:17:57 +02: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 |  | 
			
				
					| 
							
							
								 LouisLam | 34c0fa59a8 | fix reset-password (#448) (cherry picked from commit b0e9c5bcb4) | 2021-09-20 16:33:22 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | b0e9c5bcb4 | fix reset-password (#448) | 2021-09-20 16:29:18 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 0b572df3d0 | [status page] store config | 2021-09-20 16:22:18 +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 |  | 
			
				
					| 
							
							
								 Louis | a6fdd272a6 | [status page] minor | 2021-09-17 14:42:19 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 1b5e723f60 | Added descriptions to uploadBackup function | 2021-09-17 03:25:18 +02:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 4bdada36a9 | Removed if includes version | 2021-09-16 20:18:31 +02:00 |  | 
			
				
					| 
							
							
								 LouisLam | 9b8f01cfc6 | since eslint can auto fix semicolon, standardize all end with semicolon | 2021-09-16 22:57:34 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 2955abb5d9 | [status page] create incident | 2021-09-16 22:48:28 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 8b463e70df | Apply suggestions from @Saibamen Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> | 2021-09-16 12:29:33 +02:00 |  | 
			
				
					| 
							
							
								 LouisLam | 392f8275b3 | Merge branch 'master' into public-dashboard # Conflicts:
#	server/database.js | 2021-09-16 16:53:54 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 54aa68ec58 | Added import/export compatibility for version 1.7 | 2021-09-15 22:07:28 +02:00 |  | 
			
				
					| 
							
							
								 Louis Lam | 72783fd94c | Merge pull request #380 from No0Vad/retry-heartbeat-interval Added support for a retry interval to monitors | 2021-09-16 00:21:53 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 80322cbfe7 | Merge branch 'import-export' # Conflicts:
#	src/languages/it-IT.js
#	src/languages/nl-NL.js | 2021-09-16 00:18:07 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 7e0272077b | cleanup demo mode code | 2021-09-16 00:13:28 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 512ff09cca | set entry page | 2021-09-15 20:40:26 +08:00 |  |