Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								88757ebbbe
								
							
						 | 
						
							
							
								
								Merge pull request #722 from dpatrongomez/master
							
							
							
							
							
							
							
							Add spanish translation for monitor history and records 
							
						 | 
						
							2021-10-16 22:46:29 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Patrón Gómez
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a73b84ae6
								
							
						 | 
						
							
							
								
								Add records translations and fix pause translation
							
							
							
							
							
						 | 
						
							2021-10-16 12:45:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Patrón Gómez
								
							 
						 | 
						
							
							
							
							
								
							
							
								15f36f96c3
								
							
						 | 
						
							
							
								
								Add spanish translation for monitor history
							
							
							
							
							
						 | 
						
							2021-10-16 12:15:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								edcaf93446
								
							
						 | 
						
							
							
								
								Merge pull request #721 from dpatrongomez/master
							
							
							
							
							
							
							
							Add Status Translation 
							
						 | 
						
							2021-10-16 17:41:46 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								dec175d55f
								
							
						 | 
						
							
							
								
								Merge pull request #719 from bertyhell/bugfix/edit-monitor
							
							
							
							
							
							
							
							fix(edit-monitor): no need to escape placeholder {} if not translated
							
						 | 
						
							2021-10-16 17:38:00 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9a60f69f66
								
							
						 | 
						
							
							
								
								Merge pull request #720 from bertyhell/bugfix/fix-error-on-first-hearthbeat
							
							
							
							
							
							
							
							fix(monitor): safely get status of previous beat if first beat 
							
						 | 
						
							2021-10-16 17:34:44 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Daniel Patrón Gómez
								
							 
						 | 
						
							
							
							
							
								
							
							
								53a008ae2b
								
							
						 | 
						
							
							
								
								Add Status Translation
							
							
							
							
							
						 | 
						
							2021-10-16 11:32:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bert Verhelst
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d63dd9ddd
								
							
						 | 
						
							
							
								
								fix(monitor): safely get status of previous beat if first beat
							
							
							
							
							
						 | 
						
							2021-10-16 11:28:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Bert Verhelst
								
							 
						 | 
						
							
							
							
							
								
							
							
								61627545a5
								
							
						 | 
						
							
							
								
								fix(edit-monitor): no need to escape placeholder {} if not translated
							
							
							
							
							
						 | 
						
							2021-10-16 11:26:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								176fa6b60d
								
							
						 | 
						
							
							
								
								merge package-lock.json
							
							
							
							
							
						 | 
						
							2021-10-16 16:32:28 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb43ecb46e
								
							
						 | 
						
							
							
								
								Merge branch 'master' into background-jobs
							
							
							
							
							
							
							
							# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js 
							
						 | 
						
							2021-10-16 15:06:59 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e24312f67
								
							
						 | 
						
							
							
								
								[test] jest please
							
							
							
							
							
						 | 
						
							2021-10-16 14:54:45 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6ff3cb275e
								
							
						 | 
						
							
							
								
								Merge pull request #642 from andreasbrett/patch-2
							
							
							
							
							
							
							
							Harden 2FA/TOTP implementation according to rfc6238 (part 3) 
							
						 | 
						
							2021-10-16 14:30:25 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9d364b28b1
								
							
						 | 
						
							
							
								
								Merge pull request #715 from januridp/master
							
							
							
							
							
							
							
							Fix(Language): Bahasa Indonesia (Indonesian) 
							
						 | 
						
							2021-10-16 13:02:57 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc3e3f9118
								
							
						 | 
						
							
							
								
								[test] update
							
							
							
							
							
						 | 
						
							2021-10-16 13:02:04 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f3ab7b1d8
								
							
						 | 
						
							
							
								
								[test]  increase the timeout for reset-password
							
							
							
							
							
						 | 
						
							2021-10-16 12:56:33 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									NeuralMiner
								
							 
						 | 
						
							
							
							
							
								
							
							
								8cb26d2b31
								
							
						 | 
						
							
							
								
								Text update
							
							
							
							
							
						 | 
						
							2021-10-15 19:12:09 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									januridp
								
							 
						 | 
						
							
							
							
							
								
							
							
								d94fbede32
								
							
						 | 
						
							
							
								
								Fix(Language): Bahasa Indonesia (Indonesian)
							
							
							
							
							
						 | 
						
							2021-10-16 07:39:32 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									januridp
								
							 
						 | 
						
							
							
							
							
								
							
							
								76e619c066
								
							
						 | 
						
							
							
								
								Fix(Language): Bahasa Indonesia (Indonesian)
							
							
							
							
							
						 | 
						
							2021-10-16 07:36:07 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									januridp
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e4f94ab98
								
							
						 | 
						
							
							
								
								Fix(Language): Bahasa Indonesia (Indonesian)
							
							
							
							
							
						 | 
						
							2021-10-16 07:29:51 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									januridp
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed3a558397
								
							
						 | 
						
							
							
								
								Fix(Language): Bahasa Indonesia (Indonesian)
							
							
							
							
							
						 | 
						
							2021-10-16 07:15:01 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								a419aa527f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2021-10-16 01:33:56 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d26825cbe
								
							
						 | 
						
							
							
								
								[test] reset-password
							
							
							
							
							
						 | 
						
							2021-10-16 01:33:44 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								7276f34d90
								
							
						 | 
						
							
							
								
								fix reset-password
							
							
							
							
							
						 | 
						
							2021-10-16 00:57:26 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e1eeb44e7f
								
							
						 | 
						
							
							
								
								Update SECURITY.md
							
							
							
							
							
						 | 
						
							2021-10-15 19:44:29 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								f4b8da0a5c
								
							
						 | 
						
							
							
								
								Merge branch 'feature/add-support-for-method-body-and-headers'
							
							
							
							
							
						 | 
						
							2021-10-15 19:02:49 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								4178983df3
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2021-10-15 19:01:04 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ac0ab2e34
								
							
						 | 
						
							
							
								
								[http options] beautify the json format when clicked the save button
							
							
							
							
							
						 | 
						
							2021-10-15 18:57:27 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd211a6be7
								
							
						 | 
						
							
							
								
								[http options] fine tune
							
							
							
							
							
						 | 
						
							2021-10-15 18:36:40 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e71ab7406
								
							
						 | 
						
							
							
								
								Merge branch 'master' into feature/add-support-for-method-body-and-headers
							
							
							
							
							
						 | 
						
							2021-10-15 16:07:05 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								76c68071f1
								
							
						 | 
						
							
							
								
								Merge pull request #709 from iooner/patch-1
							
							
							
							
							
							
							
							Update fr-FR.js 
							
						 | 
						
							2021-10-15 15:16:22 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Phuong Nguyen Minh
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bda481c61e
								
							
						 | 
						
							
							
								
								Update vi.js
							
							
							
							
							
						 | 
						
							2021-10-15 08:26:33 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									iooner
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8242a1586d
								
							
						 | 
						
							
							
								
								Update fr-FR.js
							
							
							
							
							
						 | 
						
							2021-10-14 22:23:01 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c593a962c2
								
							
						 | 
						
							
							
								
								Merge pull request #627 from NixNotCastey/smtp-subject
							
							
							
							
							
							
							
							Add support for custom subject in emails 
							
						 | 
						
							2021-10-15 00:54:31 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c9b4d2ae2a
								
							
						 | 
						
							
							
								
								Merge pull request #698 from erktime/master
							
							
							
							
							
							
							
							Add monitor name context to Slack fallback text. 
							
						 | 
						
							2021-10-14 23:31:48 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								37105d720b
								
							
						 | 
						
							
							
								
								Merge pull request #706 from firattemel/master
							
							
							
							
							
							
							
							Update tr-TR.js 
							
						 | 
						
							2021-10-14 22:40:45 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b74b727f2
								
							
						 | 
						
							
							
								
								[Push Type] fix missing important flag and missing up notification
							
							
							
							
							
						 | 
						
							2021-10-14 22:32:15 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									firattemel
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f0119bc3f
								
							
						 | 
						
							
							
								
								Update tr-TR.js
							
							
							
							
							
						 | 
						
							2021-10-14 17:29:13 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7d2a34dae
								
							
						 | 
						
							
							
								
								fix ping bug
							
							
							
							
							
						 | 
						
							2021-10-14 18:48:40 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								60acb91fc8
								
							
						 | 
						
							
							
								
								Merge pull request #687 from xjoker/master
							
							
							
							
							
							
							
							Add new notification `Aliyun Sms` and `DingDing` 
							
						 | 
						
							2021-10-14 17:02:23 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								f51156f18e
								
							
						 | 
						
							
							
								
								run eslint for #687
							
							
							
							
							
						 | 
						
							2021-10-14 16:24:03 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								8338881927
								
							
						 | 
						
							
							
								
								[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
							
							
							
							
							
						 | 
						
							2021-10-14 16:07:25 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								674b387c95
								
							
						 | 
						
							
							
								
								Merge branch 'master' into smtp-subject
							
							
							
							
							
						 | 
						
							2021-10-14 14:59:54 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ff9a64e5e
								
							
						 | 
						
							
							
								
								[Push Type] Fix missing duration calculation (#685)
							
							
							
							
							
						 | 
						
							2021-10-14 14:42:34 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								4bee57ea7f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'giacomo892/patch-1'
							
							
							
							
							
							
							
							# Conflicts:
#	server/ping-lite.js 
							
						 | 
						
							2021-10-14 14:10:51 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Louis Lam
								
							 
						 | 
						
							
							
							
							
								
							
							
								f75c9e4f0c
								
							
						 | 
						
							
							
								
								add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
							
							
							
							
							
						 | 
						
							2021-10-14 14:09:16 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									xJoker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								8ab4788f80
								
							
						 | 
						
							
							
								
								Update src/components/notifications/index.js
							
							
							
							
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						
							2021-10-14 09:33:36 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									xJoker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4e4ab0577e
								
							
						 | 
						
							
							
								
								Update src/components/notifications/index.js
							
							
							
							
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						
							2021-10-14 09:33:31 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									xJoker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6e04ec436e
								
							
						 | 
						
							
							
								
								Update server/notification-providers/dingding.js
							
							
							
							
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						
							2021-10-14 07:34:45 +08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									xJoker
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2d471a5e84
								
							
						 | 
						
							
							
								
								Update server/notification-providers/dingding.js
							
							
							
							
							
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						
							2021-10-14 07:34:33 +08:00 | 
						
						
							
							
							
								
							
							
						 |