Louis Lam
							
						 
					 | 
					
						
						
							
						
						4a6d7207ef
					 | 
					
						
						
							
							Merge branch 'master' into customstatuspage
						
						
						
						
						
						
						
						# Conflicts:
#	src/languages/de-DE.js
#	src/languages/en.js
#	src/pages/StatusPage.vue 
						
						
					 | 
					
						2022-04-12 19:39:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						772d009f43
					 | 
					
						
						
							
							Merge branch 'master' into fluencydoc_master
						
						
						
						
						
						
						
						# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js 
						
						
					 | 
					
						2022-04-12 17:44:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						9ec29c1bc4
					 | 
					
						
						
							
							Add back debug() for safe, but it is marked as deprecated
						
						
						
						
						
						
					 | 
					
						2022-04-12 16:37:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						279e2eb3f6
					 | 
					
						
						
							
							Merge branch 'master' into logging
						
						
						
						
						
						
						
						# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js 
						
						
					 | 
					
						2022-04-12 16:32:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						a0d1ae2cce
					 | 
					
						
						
							
							Better alignment of monitor list item
						
						
						
						
						
						
					 | 
					
						2022-04-11 18:02:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						f030487f7d
					 | 
					
						
						
							
							Fix theme color that do not apply to status page with a custom domain
						
						
						
						
						
						
					 | 
					
						2022-04-10 13:46:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c9fa183712
					 | 
					
						
						
							
							Manage domain names
						
						
						
						
						
						
					 | 
					
						2022-04-10 00:25:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						0b9b5102ec
					 | 
					
						
						
							
							Minor
						
						
						
						
						
						
					 | 
					
						2022-04-09 17:23:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c399984b7f
					 | 
					
						
						
							
							Improve status page sidebar
						
						
						
						
						
						
					 | 
					
						2022-04-09 17:03:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						0afa0be5c2
					 | 
					
						
						
							
							Merge branch 'master' into status-page-domain
						
						
						
						
						
						
						
						# Conflicts:
#	server/database.js 
						
						
					 | 
					
						2022-04-09 16:07:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						a2d9474e85
					 | 
					
						
						
							
							Copy some keys from zh-TW to zh-HK
						
						
						
						
						
						
					 | 
					
						2022-04-09 14:51:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						8479e772cd
					 | 
					
						
						
							
							Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation
						
						
						
						
						
						
						
						Update zh-TW translation 
						
						
					 | 
					
						2022-04-09 14:44:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						2e50ef0e8f
					 | 
					
						
						
							
							Merge pull request #1450 from AnnAngela/1.14.0-zh_cn
						
						
						
						
						
						
						
						1.14.0 translation improvement 
						
						
					 | 
					
						2022-04-09 14:40:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JohnnyChiang
							
						 
					 | 
					
						
						
							
						
						25b5edea7f
					 | 
					
						
						
							
							Update zh-TW translation
						
						
						
						
						
						
					 | 
					
						2022-04-08 01:47:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						fcb577097b
					 | 
					
						
						
							
							[Proxy] Change to radio button
						
						
						
						
						
						
					 | 
					
						2022-04-07 15:26:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						e89356b283
					 | 
					
						
						
							
							Show proxy option for http monitor only
						
						
						
						
						
						
					 | 
					
						2022-04-07 14:37:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c4e74c9943
					 | 
					
						
						
							
							Render <StatusPage> if domain matched
						
						
						
						
						
						
					 | 
					
						2022-04-06 22:43:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						355aec46dc
					 | 
					
						
						
							
							Merge branch 'master' into status-page-domain
						
						
						
						
						
						
					 | 
					
						2022-04-05 22:59:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						70311f7a5a
					 | 
					
						
						
							
							Add an option to enable/disable the domain name expiry notification #1364
						
						
						
						
						
						
					 | 
					
						2022-04-05 21:27:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						4b99160b1f
					 | 
					
						
						
							
							Fix "Check Update" is not checked by default
						
						
						
						
						
						
					 | 
					
						2022-04-05 19:43:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AnnAngela-work
							
						 
					 | 
					
						
						
							
						
						8e78e62eee
					 | 
					
						
						
							
							Make translation better
						
						
						
						
						
						
					 | 
					
						2022-04-04 17:24:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AnnAngela
							
						 
					 | 
					
						
						
							
						
						706d6cee07
					 | 
					
						
						
							
							Update some components to use i18n function, update en & zh-CN translation
						
						
						
						
						
						
					 | 
					
						2022-04-04 11:33:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AnnAngela-work
							
						 
					 | 
					
						
						
							
						
						43eed45bae
					 | 
					
						
						
							
							first part of zh-CN.js translation
						
						
						
						
						
						
					 | 
					
						2022-04-03 22:08:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								AnnAngela-work
							
						 
					 | 
					
						
						
							
						
						19b7e2ba5e
					 | 
					
						
						
							
							Using grep to search $t("foo")-like pattern to fill up the missing part of en i18n file
						
						
						
						
						
						
					 | 
					
						2022-04-03 22:08:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						3218a0eee8
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-04-02 11:26:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						87ee3c20bd
					 | 
					
						
						
							
							Update proxy password field
						
						
						
						
						
						
					 | 
					
						2022-04-02 11:25:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						04e3394d02
					 | 
					
						
						
							
							Merge branch 'master' into feature/request-with-http-proxy
						
						
						
						
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js 
						
						
					 | 
					
						2022-04-01 14:57:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Balázs Csaba
							
						 
					 | 
					
						
						
							
						
						53cea7f8d3
					 | 
					
						
						
							
							fix: update hu lang
						
						
						
						
						
						
					 | 
					
						2022-03-31 22:25:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						aef7719426
					 | 
					
						
						
							
							Merge pull request #1435 from LoaderB0T/favico
						
						
						
						
						
						
						
						feat: Favicon is updated based on satus page logo 
						
						
					 | 
					
						2022-03-31 21:32:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						514b9fb68a
					 | 
					
						
						
							
							Add remark
						
						
						
						
						
						
					 | 
					
						2022-03-31 21:30:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						da32a1aa19
					 | 
					
						
						
							
							Add uk-UA to the languageList
						
						
						
						
						
						
					 | 
					
						2022-03-31 16:24:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						7a69f9f56f
					 | 
					
						
						
							
							Merge pull request #1438 from Deni7/master
						
						
						
						
						
						
						
						Add ukrainian translation 
						
						
					 | 
					
						2022-03-31 16:22:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c50c20faa4
					 | 
					
						
						
							
							Minor fix for uk-UA
						
						
						
						
						
						
					 | 
					
						2022-03-31 16:19:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						cb6eeaef34
					 | 
					
						
						
							
							Bring connection error bar to the top
						
						
						
						
						
						
					 | 
					
						2022-03-31 16:15:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Denis Stepanov
							
						 
					 | 
					
						
						
							
						
						ee3d7d8b42
					 | 
					
						
						
							
							Add ukrainian translation
						
						
						
						
						
						
					 | 
					
						2022-03-30 23:21:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Denis Stepanov
							
						 
					 | 
					
						
						
							
						
						a277cfe9e8
					 | 
					
						
						
							
							Add ukrainian translation
						
						
						
						
						
						
					 | 
					
						2022-03-30 23:16:04 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Denis Stepanov
							
						 
					 | 
					
						
						
							
						
						95b0df0270
					 | 
					
						
						
							
							Add ukrainian translation
						
						
						
						
						
						
					 | 
					
						2022-03-30 23:15:28 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						71be030733
					 | 
					
						
						
							
							Add package-lock.json and minor words
						
						
						
						
						
						
					 | 
					
						2022-03-30 18:52:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Janik Schumacher
							
						 
					 | 
					
						
						
							
						
						73b338bba6
					 | 
					
						
						
							
							feat: Favicon is updated based on satus page logo
						
						
						
						
						
						
					 | 
					
						2022-03-30 12:09:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						82ea896bbc
					 | 
					
						
						
							
							Improve the workflow of cloudflared
						
						
						
						
						
						
					 | 
					
						2022-03-30 11:59:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						f1f4b3b377
					 | 
					
						
						
							
							Add reverse proxy setting page for controlling cloudflared
						
						
						
						
						
						
					 | 
					
						2022-03-30 01:49:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						b8dea3a823
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:39:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						0da6e6b1fb
					 | 
					
						
						
							
							Some improvements
						
						
						
						
						
						
					 | 
					
						2022-03-29 17:38:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								DX37
							
						 
					 | 
					
						
						
							
						
						61d0a0abce
					 | 
					
						
						
							
							update russian translation
						
						
						
						
						
						
					 | 
					
						2022-03-28 21:16:13 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Nickson
							
						 
					 | 
					
						
						
							
						
						88604845e6
					 | 
					
						
						
							
							Merge branch 'master' into #1209-Logout-button-in-navbar
						
						
						
						
						
						
					 | 
					
						2022-03-27 13:48:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sovushik
							
						 
					 | 
					
						
						
							
						
						e11ea7b061
					 | 
					
						
						
							
							Update ru-RU.js
						
						
						
						
						
						
						
						Add new string for 1.13.1 
						
						
					 | 
					
						2022-03-26 10:46:07 +05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						12237dec6e
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2022-03-26 02:09:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						f6272155af
					 | 
					
						
						
							
							Show page not found for invalid routes
						
						
						
						
						
						
					 | 
					
						2022-03-26 02:09:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						1ecd2e45d0
					 | 
					
						
						
							
							[Status Page] Plan to support domain names for status pages
						
						
						
						
						
						
					 | 
					
						2022-03-25 18:59:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ivan Bratović
							
						 
					 | 
					
						
						
							
						
						5922771909
					 | 
					
						
						
							
							Update croatian (hr-HR) translation file
						
						
						
						
						
						
						
						Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com> 
						
						
					 | 
					
						2022-03-25 11:05:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |