LouisLam
							
						 
					 | 
					
						
						
							
						
						f47f7758f9
					 | 
					
						
						
							
							Merge branch 'master' into public-dashboard
						
						
						
						
						
						
						
						# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js 
						
						
					 | 
					
						2021-09-13 01:09:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						ddcd3c2a19
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/timezones-package
						
						
						
						
						
						
					 | 
					
						2021-09-12 19:03:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						7df9698e5d
					 | 
					
						
						
							
							eslint: comma-dangle for language files
						
						
						
						
						
						
					 | 
					
						2021-09-13 00:58:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						471333ad03
					 | 
					
						
						
							
							fix(util-frontend): revert typescript conversion
						
						
						
						
						
						
					 | 
					
						2021-09-12 18:56:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						d313966d80
					 | 
					
						
						
							
							Merge branch 'master' into import-export
						
						
						
						
						
						
					 | 
					
						2021-09-12 18:46:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						8205f90f3d
					 | 
					
						
						
							
							update language files
						
						
						
						
						
						
					 | 
					
						2021-09-13 00:45:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Denis Freund
							
						 
					 | 
					
						
						
							
						
						8352d9abbe
					 | 
					
						
						
							
							add posibility to have a prefixMessage before the embed
						
						
						
						
						
						
					 | 
					
						2021-09-12 17:54:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						2d7767c905
					 | 
					
						
						
							
							Merge pull request #392 from bertyhell/bugfix/button-margin-settings
						
						
						
						
						
						
						
						fix(settings): add some button bottom margin for narrow screens 
						
						
					 | 
					
						2021-09-12 23:49:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c52b9b63d5
					 | 
					
						
						
							
							Merge pull request #389 from Ponkhy/default-notification
						
						
						
						
						
						
						
						Wording correction for notification modal 
						
						
					 | 
					
						2021-09-12 23:49:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						e55193270d
					 | 
					
						
						
							
							Merge pull request #377 from Lrss/master
						
						
						
						
						
						
						
						Fix: Inconsistent white-space for the "Avg."-Ping/Response title. 
						
						
					 | 
					
						2021-09-12 23:48:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						9d39071a91
					 | 
					
						
						
							
							Merge pull request #363 from Ponkhy/2fa
						
						
						
						
						
						
						
						Added simple TOTP Two Factor Authentication 
						
						
					 | 
					
						2021-09-12 23:47:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						a170694a83
					 | 
					
						
						
							
							fix(util-frontend): improve formatting timezoneList
						
						
						
						
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
						
						
					 | 
					
						2021-09-12 15:21:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						5969e913b5
					 | 
					
						
						
							
							fix(util-frontend): improve formatting
						
						
						
						
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
						
						
					 | 
					
						2021-09-12 15:19:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						0d280f5edb
					 | 
					
						
						
							
							Merge pull request #376 from chakflying/patch-7
						
						
						
						
						
						
						
						Fix: Fix events table width on mobile 
						
						
					 | 
					
						2021-09-12 21:12:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						660b969178
					 | 
					
						
						
							
							fix(settings): switch custom styles to bootstrap class for bottom margin
						
						
						
						
						
						
					 | 
					
						2021-09-12 14:52:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						c26622aa39
					 | 
					
						
						
							
							fix(settings): add some button bottom margin for narrow screens
						
						
						
						
						
						
					 | 
					
						2021-09-12 13:40:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bert Verhelst
							
						 
					 | 
					
						
						
							
						
						a7674755ba
					 | 
					
						
						
							
							Move timezones to npm package and convert util-frontend.js to typescript
						
						
						
						
						
						
					 | 
					
						2021-09-12 13:27:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						db14768229
					 | 
					
						
						
							
							Wording correction for notification modal
						
						
						
						
						
						
					 | 
					
						2021-09-12 01:44:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								No0Vad
							
						 
					 | 
					
						
						
							
						
						3d27561e5a
					 | 
					
						
						
							
							Update en.js
						
						
						
						
						
						
						
						Fixed spelling error 
						
						
					 | 
					
						2021-09-12 00:24:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jtagcat
							
						 
					 | 
					
						
						
							
						
						b80c88d9a0
					 | 
					
						
						
							
							i10n: update Estonian
						
						
						
						
						
						
					 | 
					
						2021-09-12 00:51:03 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						862672731f
					 | 
					
						
						
							
							Minor typo fix
						
						
						
						
						
						
					 | 
					
						2021-09-11 22:06:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						7fee4a7ea7
					 | 
					
						
						
							
							Added import options
						
						
						
						
						
						
					 | 
					
						2021-09-11 21:53:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								No0Vad
							
						 
					 | 
					
						
						
							
						
						f8f9f59464
					 | 
					
						
						
							
							Added support for a retry interval to monitors
						
						
						
						
						
						
						
						If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again. 
						
						
					 | 
					
						2021-09-11 18:54:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						934685637a
					 | 
					
						
						
							
							[Status Page] WIP: Checkpoint
						
						
						
						
						
						
					 | 
					
						2021-09-11 23:43:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						8cd5bad44c
					 | 
					
						
						
							
							Merge branch 'master' into 2fa
						
						
						
						
						
						
					 | 
					
						2021-09-11 16:32:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						d003abcd60
					 | 
					
						
						
							
							Update src/languages/en.js
						
						
						
						
						
						
						
						Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
						
						
					 | 
					
						2021-09-11 14:34:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lars Sørensen
							
						 
					 | 
					
						
						
							
						
						66769e1c79
					 | 
					
						
						
							
							Fixed inconsistent white-space for the "Avg."-Ping/Response title.
						
						
						
						
						
						
					 | 
					
						2021-09-11 13:52:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						3e25f0e9d9
					 | 
					
						
						
							
							[Status Page] WIP: Checkpoint
						
						
						
						
						
						
					 | 
					
						2021-09-11 19:40:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lars Sørensen
							
						 
					 | 
					
						
						
							
						
						39c7b5e748
					 | 
					
						
						
							
							Added new Strings to Danish translation
						
						
						
						
						
						
					 | 
					
						2021-09-11 13:37:53 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Lars Sørensen
							
						 
					 | 
					
						
						
							
						
						b709857e19
					 | 
					
						
						
							
							Better wording for Danish language
						
						
						
						
						
						
					 | 
					
						2021-09-11 13:20:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						9e10f7d35f
					 | 
					
						
						
							
							Fix: Fix events table width on mobile
						
						
						
						
						
						
					 | 
					
						2021-09-11 18:56:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Stachowicz
							
						 
					 | 
					
						
						
							
						
						c387fb264e
					 | 
					
						
						
							
							Format JSON file before download
						
						
						
						
						
						
					 | 
					
						2021-09-11 10:50:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						4b0a8087a2
					 | 
					
						
						
							
							do not connect to socket io for status page
						
						
						
						
						
						
					 | 
					
						2021-09-11 16:22:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						2da77d8448
					 | 
					
						
						
							
							fix ipv6 connection problem
						
						
						
						
						
						
					 | 
					
						2021-09-11 14:37:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paride Barison
							
						 
					 | 
					
						
						
							
						
						951ece8a65
					 | 
					
						
						
							
							updated
						
						
						
						
						
						
					 | 
					
						2021-09-10 12:07:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						97df200d6c
					 | 
					
						
						
							
							Merge pull request #365 from Ponkhy/master
						
						
						
						
						
						
						
						Minor translation fixes 
						
						
					 | 
					
						2021-09-10 11:46:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								新逸Cary
							
						 
					 | 
					
						
						
							
						
						2f0d994c83
					 | 
					
						
						
							
							update Simplified Chinese language(更新简体中文语言)
						
						
						
						
						
						
					 | 
					
						2021-09-10 09:26:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						c3c576bd13
					 | 
					
						
						
							
							Added "Show URI" translation
						
						
						
						
						
						
					 | 
					
						2021-09-10 01:33:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						c62732fa9c
					 | 
					
						
						
							
							Minor translation fixes
						
						
						
						
						
						
					 | 
					
						2021-09-10 01:24:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						d823493fad
					 | 
					
						
						
							
							Added maxlengh to token verify input
						
						
						
						
						
						
					 | 
					
						2021-09-09 22:08:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						463c385cf1
					 | 
					
						
						
							
							Only show modal footer if uri was generated
						
						
						
						
						
						
					 | 
					
						2021-09-09 21:38:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ponkhy
							
						 
					 | 
					
						
						
							
						
						403202d4d4
					 | 
					
						
						
							
							Added simple TOTP Two Factor Authentication
						
						
						
						
						
						
					 | 
					
						2021-09-09 21:10:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						ca479673e7
					 | 
					
						
						
							
							avoid Chrome duplicate id warning
						
						
						
						
						
						
					 | 
					
						2021-09-09 21:28:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						573c7faddd
					 | 
					
						
						
							
							switch on the notification, if it is added in EditMonitor.vue
						
						
						
						
						
						
					 | 
					
						2021-09-09 21:24:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						7a4432de1e
					 | 
					
						
						
							
							better switch button color in dark mode
						
						
						
						
						
						
					 | 
					
						2021-09-09 20:45:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								LouisLam
							
						 
					 | 
					
						
						
							
						
						94a6c1a344
					 | 
					
						
						
							
							update language files
						
						
						
						
						
						
					 | 
					
						2021-09-09 20:38:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paride Barison
							
						 
					 | 
					
						
						
							
						
						44eba70b78
					 | 
					
						
						
							
							altri errorini sistemati
						
						
						
						
						
						
					 | 
					
						2021-09-09 14:19:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Paride Barison
							
						 
					 | 
					
						
						
							
						
						c6dab944d1
					 | 
					
						
						
							
							altra correzione
						
						
						
						
						
						
					 | 
					
						2021-09-09 14:12:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ioma Taani
							
						 
					 | 
					
						
						
							
						
						0f4bc5850b
					 | 
					
						
						
							
							Merge branch 'louislam:master' into italian-translation-update
						
						
						
						
						
						
					 | 
					
						2021-09-09 14:05:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						331ae5ec20
					 | 
					
						
						
							
							Merge pull request #306 from Ponkhy/import-export
						
						
						
						
						
						
						
						Added import and export function 
						
						
					 | 
					
						2021-09-09 16:15:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |