LouisLam
							
						 | 
						
							
							
							
								
							
								f47f7758f9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into public-dashboard
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								7df9698e5d
								
							
								
							
						 | 
						
							
							
								
								eslint: comma-dangle for language files
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								8205f90f3d
								
							
								
							
						 | 
						
							
							
								
								update language files
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								02247c4174
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								2d7767c905
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #392 from bertyhell/bugfix/button-margin-settings
							
							
							
							
							
							
								
							
							
							fix(settings): add some button bottom margin for narrow screens 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								c52b9b63d5
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #389 from Ponkhy/default-notification
							
							
							
							
							
							
								
							
							
							Wording correction for notification modal 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								e55193270d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #377 from Lrss/master
							
							
							
							
							
							
								
							
							
							Fix: Inconsistent white-space for the "Avg."-Ping/Response title. 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								9d39071a91
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #363 from Ponkhy/2fa
							
							
							
							
							
							
								
							
							
							Added simple TOTP Two Factor Authentication 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								0d280f5edb
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #376 from chakflying/patch-7
							
							
							
							
							
							
								
							
							
							Fix: Fix events table width on mobile 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Bert Verhelst
							
						 | 
						
							
							
							
								
							
								660b969178
								
							
								
							
						 | 
						
							
							
								
								fix(settings): switch custom styles to bootstrap class for bottom margin
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Bert Verhelst
							
						 | 
						
							
							
							
								
							
								c26622aa39
								
							
								
							
						 | 
						
							
							
								
								fix(settings): add some button bottom margin for narrow screens
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								6d7cb44acc
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #387 from jtagcat/et2
							
							
							
							
							
							
								
							
							
							i10n: update Estonian 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								400fc13cf2
								
							
								
							
						 | 
						
							
							
								
								add npm install script for npm7
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
							
								
							
								db14768229
								
							
								
							
						 | 
						
							
							
								
								Wording correction for notification modal
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								jtagcat
							
						 | 
						
							
							
							
								
							
								b80c88d9a0
								
							
								
							
						 | 
						
							
							
								
								i10n: update Estonian
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								c4f78d776e
								
							
								
							
						 | 
						
							
							
								
								[2fa] "UptimeKuma" to "Uptime Kuma"
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								934685637a
								
							
								
							
						 | 
						
							
							
								
								[Status Page] WIP: Checkpoint
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
							
								
							
								295ccba44b
								
							
								
							
						 | 
						
							
							
								
								Adjusted for new db patch management
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
								
								
							
							
								
							
								8cd5bad44c
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into 2fa
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
								
								
							
							
								
							
								d003abcd60
								
									
								
							
								
							
						 | 
						
							
							
								
								Update src/languages/en.js
							
							
							
							
							
							
								
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
								
								
							
							
								
							
								f6d1a82989
								
									
								
							
								
							
						 | 
						
							
							
								
								Update server/server.js
							
							
							
							
							
							
								
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
								
								
							
							
								
							
								651b525d06
								
									
								
							
								
							
						 | 
						
							
							
								
								Update server/server.js
							
							
							
							
							
							
								
							
							
							Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Lars Sørensen
							
						 | 
						
							
							
								
								
							
							
								
							
								66769e1c79
								
									
								
							
								
							
						 | 
						
							
							
								
								Fixed inconsistent white-space for the "Avg."-Ping/Response title.
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								3e25f0e9d9
								
							
								
							
						 | 
						
							
							
								
								[Status Page] WIP: Checkpoint
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Lars Sørensen
							
						 | 
						
							
							
								
								
							
							
								
							
								39c7b5e748
								
									
								
							
								
							
						 | 
						
							
							
								
								Added new Strings to Danish translation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Lars Sørensen
							
						 | 
						
							
							
								
								
							
							
								
							
								b709857e19
								
									
								
							
								
							
						 | 
						
							
							
								
								Better wording for Danish language
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Nelson Chan
							
						 | 
						
							
							
								
								
							
							
								
							
								9e10f7d35f
								
									
								
							
								
							
						 | 
						
							
							
								
								Fix: Fix events table width on mobile
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								6caae725f9
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #375 from Saibamen/format_backup_json
							
							
							
							
							
							
								
							
							
							Format JSON file before download 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Adam Stachowicz
							
						 | 
						
							
							
							
								
							
								c387fb264e
								
							
								
							
						 | 
						
							
							
								
								Format JSON file before download
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								4b0a8087a2
								
							
								
							
						 | 
						
							
							
								
								do not connect to socket io for status page
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								08c7a37052
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into public-dashboard
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								0969be5981
								
							
								
							
						 | 
						
							
							
								
								Revert "WIP: Add login page, nav bar buttons"
							
							
							
							
							
							
								
							
							
							This reverts commit b9a6088f50. 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								2ed8f12dc0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								2da77d8448
								
							
								
							
						 | 
						
							
							
								
								fix ipv6 connection problem
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								f8322de5da
								
									
								
							
								
							
						 | 
						
							
							
								
								Update bug_report.md
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								e21a18a593
								
									
								
							
								
							
						 | 
						
							
							
								
								Update ask-for-help.md
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
							
								
							
								14b7688b70
								
							
								
							
						 | 
						
							
							
								
								Added NOT NULL to twofa_status
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								ef1604675b
								
							
								
							
						 | 
						
							
							
								
								change to node:14-bullseye-slim, and reduce the docker image size
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								83fc844e8e
								
									
								
							
								
							
						 | 
						
							
							
								
								Update deployment.yml
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								22a7acbaf6
								
									
								
							
								
							
						 | 
						
							
							
								
								Update README.md
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								201bba63d7
								
							
								
							
						 | 
						
							
							
								
								add a healthcheck comment
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								31b4a5c33e
								
							
								
							
						 | 
						
							
							
								
								build-docker, debian first
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								a49df29a87
								
							
								
							
						 | 
						
							
							
								
								update to 1.6.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								LouisLam
							
						 | 
						
							
							
							
								
							
								08de0090dc
								
							
								
							
						 | 
						
							
							
								
								add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								97df200d6c
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #365 from Ponkhy/master
							
							
							
							
							
							
								
							
							
							Minor translation fixes 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Louis Lam
							
						 | 
						
							
							
								
								
							
							
								
							
								d5b17a3778
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #367 from xinac721/master
							
							
							
							
							
							
								
							
							
							update Simplified Chinese language(更新简体中文语言) 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								新逸Cary
							
						 | 
						
							
							
							
								
							
								2f0d994c83
								
							
								
							
						 | 
						
							
							
								
								update Simplified Chinese language(更新简体中文语言)
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								新逸Cary
							
						 | 
						
							
							
								
								
							
							
								
							
								e683033f4e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #2 from louislam/master
							
							
							
							
							
							
								
							
							
							update 
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
							
								
							
								c3c576bd13
								
							
								
							
						 | 
						
							
							
								
								Added "Show URI" translation
							
							
							
							
								
							
							
						 | 
						4 years ago | 
					
				
					
						
							
							
								 
								Ponkhy
							
						 | 
						
							
							
							
								
							
								c62732fa9c
								
							
								
							
						 | 
						
							
							
								
								Minor translation fixes
							
							
							
							
								
							
							
						 | 
						4 years ago |