Cyril59310 
							
						 
					 
					
						
						
							
						
						ae0ef79060 
					 
					
						
						
							
							Update french translation  ( #2634 )  
						
						
						
						
							
						
					 
					
						2023-01-24 15:16:18 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						a2045b59bb 
					 
					
						
						
							
							Merge pull request  #2638  from amworx/master  
						
						... 
						
						
						
						Arabic language support is now in action ✌️  
						
						
							
						
					 
					
						2023-01-24 14:25:55 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8ade7120ff 
					 
					
						
						
							
							Update src/i18n.js  
						
						... 
						
						
						
						Co-authored-by: 401Unauthorized <redme@live.cn > 
						
						
							
						
					 
					
						2023-01-24 13:24:42 +08:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						e9044ae956 
					 
					
						
						
							
							Removed repetitiion of %  
						
						... 
						
						
						
						Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
						
						
							
						
					 
					
						2023-01-23 18:10:45 +00:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						0c86a4d4e7 
					 
					
						
						
							
							Merge pull request  #2659  from Buchtic/master  
						
						... 
						
						
						
						Update cs-CZ.js 
						
						
							
						
					 
					
						2023-01-24 00:13:17 +08:00 
						 
				 
			
				
					
						
							
							
								401Unauthorized 
							
						 
					 
					
						
						
							
						
						5683896910 
					 
					
						
						
							
							docs: prepare for weblate  
						
						
						
						
							
						
					 
					
						2023-01-23 21:06:58 +08:00 
						 
				 
			
				
					
						
							
							
								Buchtič 
							
						 
					 
					
						
						
							
						
						b288d71535 
					 
					
						
						
							
							Update cs-CZ.js  
						
						
						
						
							
						
					 
					
						2023-01-23 10:20:22 +01:00 
						 
				 
			
				
					
						
							
							
								Abdulrahman Mustafa 
							
						 
					 
					
						
						
							
						
						861ddc6117 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/amworx/uptime-kuma  
						
						
						
						
							
						
					 
					
						2023-01-22 21:31:22 +00:00 
						 
				 
			
				
					
						
							
							
								Abdulrahman Mustafa 
							
						 
					 
					
						
						
							
						
						1197f881a1 
					 
					
						
						
							
							Checked with eslint, with no errors  
						
						
						
						
							
						
					 
					
						2023-01-22 21:31:02 +00:00 
						 
				 
			
				
					
						
							
							
								Abdulrahman Mustafa 
							
						 
					 
					
						
						
							
						
						211cbd4687 
					 
					
						
						
							
							Merge branch 'louislam:master' into master  
						
						
						
						
							
						
					 
					
						2023-01-22 23:28:24 +03:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						cd017fce98 
					 
					
						
						
							
							Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors  
						
						
						
						
							
						
					 
					
						2023-01-22 02:22:59 +03:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						dd6a76c4cc 
					 
					
						
						
							
							Merge pull request  #2652  from Metatropics/main  
						
						... 
						
						
						
						Removed superflous 'Message' prefix from Pushover 
						
						
							
						
					 
					
						2023-01-21 22:16:17 +08:00 
						 
				 
			
				
					
						
							
							
								alejandrohernandezrosales 
							
						 
					 
					
						
						
							
						
						fa23e7ad19 
					 
					
						
						
							
							Removed superflous Message prefix  
						
						
						
						
							
						
					 
					
						2023-01-20 23:59:11 -06:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						aef85078eb 
					 
					
						
						
							
							reorder fix  
						
						
						
						
							
						
					 
					
						2023-01-20 12:29:56 +03:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						86ba6f829e 
					 
					
						
						
							
							Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors  
						
						
						
						
							
						
					 
					
						2023-01-20 12:27:28 +03:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6ccf741bc4 
					 
					
						
						
							
							Merge pull request  #2632  from chakflying/fix/docker-timeout  
						
						... 
						
						
						
						Fix: Use default timeout & CachebleDnsHttpsAgent for docker monitor 
						
						
							
						
					 
					
						2023-01-19 19:26:40 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						0a58069742 
					 
					
						
						
							
							Merge pull request  #2641  from louislam/1.19.X  
						
						... 
						
						
						
						Merge 1.19.6 to 1.20.X 
						
						
							
						
					 
					
						2023-01-19 14:27:45 +08:00 
						 
				 
			
				
					
						
							
							
								Abdulrahman Mustafa 
							
						 
					 
					
						
						
							
						
						316599210d 
					 
					
						
						
							
							Arabic language support is now in action  ✌️  
						
						
						
						
							
						
					 
					
						2023-01-18 19:03:04 +00:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2b57b3e863 
					 
					
						
						
							
							Update to 1.19.6  
						
						
						
						
							
 
						
					 
					
						2023-01-19 02:17:17 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6cd6a2edf0 
					 
					
						
						
							
							Fix ping issue on Windows  #2636  
						
						
						
						
							
						
					 
					
						2023-01-19 02:16:07 +08:00 
						 
				 
			
				
					
						
							
							
								Matthew Nickson 
							
						 
					 
					
						
						
							
						
						86bcb85e9b 
					 
					
						
						
							
							Perform sanity check on uptime for status page  
						
						... 
						
						
						
						Fixes  #2628 
A sanity check is performed when calculating the uptime of a monitor on
status page. If it is greater than 100%, we just show 100%. This hasn't
been implemented on the dashboard at the request of @louislam due to
concerns it would make debugging more difficult in future if changes
were made to the uptime calculation.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com > 
					
						2023-01-18 16:38:55 +00:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						6961b1bdd2 
					 
					
						
						
							
							Fix: Use default timeout & CachebleDnsHttpsAgent  
						
						
						
						
							
						
					 
					
						2023-01-18 09:53:04 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						54d4c4d3f7 
					 
					
						
						
							
							Merge package-lock.json  
						
						
						
						
							
						
					 
					
						2023-01-17 21:18:13 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c47b6c5995 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/1.19.X'  
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json
#	package.json
#	src/util-frontend.js 
						
						
							
						
					 
					
						2023-01-17 21:17:04 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						7ef404ccc1 
					 
					
						
						
							
							Update to 1.19.5  
						
						
						
						
							
 
						
					 
					
						2023-01-17 20:32:44 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						a5ff27da7a 
					 
					
						
						
							
							Drop the property monitor.maintenance, use lastHeartBeat.status to check status instead  
						
						
						
						
							
						
					 
					
						2023-01-17 17:34:47 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						7bb12a7e00 
					 
					
						
						
							
							Fix   #2608  
						
						
						
						
							
						
					 
					
						2023-01-17 17:25:35 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						27585d0812 
					 
					
						
						
							
							Fix   #2618  
						
						
						
						
							
						
					 
					
						2023-01-17 01:21:01 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						e675316635 
					 
					
						
						
							
							Merge pull request  #2586  from PopcornPanda/fix-2544  
						
						... 
						
						
						
						Fix: Allow long sms in PromoSMS 
						
						
							
						
					 
					
						2023-01-16 13:21:56 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						b073ec2287 
					 
					
						
						
							
							Add Help button which links to wiki  
						
						
						
						
							
						
					 
					
						2023-01-16 12:39:24 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						31f45dcfc9 
					 
					
						
						
							
							Merge pull request  #2540  from twiggotronix/add-mqtt-schemes  
						
						... 
						
						
						
						Add mqtt, mqtts, ws and wss protocols to the mqtt monitor 
						
						
							
						
					 
					
						2023-01-15 20:14:11 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						49ac71e25c 
					 
					
						
						
							
							Merge pull request  #2549  from Computroniks/docs/update-jsdoc-2023-01-05  
						
						... 
						
						
						
						Added missing JSDoc comments 
						
						
							
						
					 
					
						2023-01-15 13:10:17 +08:00 
						 
				 
			
				
					
						
							
							
								401Unauthorized 
							
						 
					 
					
						
						
							
						
						8128c8081b 
					 
					
						
						
							
							sync language file changes  
						
						
						
						
							
						
					 
					
						2023-01-15 10:50:52 +08:00 
						 
				 
			
				
					
						
							
							
								401Unauthorized 
							
						 
					 
					
						
						
							
						
						e99652c5a2 
					 
					
						
						
							
							sync language file changes  
						
						
						
						
							
						
					 
					
						2023-01-15 10:46:29 +08:00 
						 
				 
			
				
					
						
							
							
								401Unauthorized 
							
						 
					 
					
						
						
							
						
						ceb7d48118 
					 
					
						
						
							
							add convert script  
						
						
						
						
							
						
					 
					
						2023-01-15 10:46:29 +08:00 
						 
				 
			
				
					
						
							
							
								401Unauthorized 
							
						 
					 
					
						
						
							
						
						bfa32f6b07 
					 
					
						
						
							
							comment not allowed in json file  
						
						
						
						
							
						
					 
					
						2023-01-15 10:46:29 +08:00 
						 
				 
			
				
					
						
							
							
								401Unauthorized 
							
						 
					 
					
						
						
							
						
						ae3a543b3b 
					 
					
						
						
							
							convert language files to json format  
						
						
						
						
							
						
					 
					
						2023-01-15 10:46:29 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						1a9b013fc2 
					 
					
						
						
							
							Merge pull request  #2328  from rmarops/mongodb-ping  
						
						... 
						
						
						
						added MongoDB ping monitor 
						
						
							
						
					 
					
						2023-01-15 01:43:43 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						1326761a8a 
					 
					
						
						
							
							Update mongodb and simplify the logic of mongodbPing  
						
						
						
						
							
						
					 
					
						2023-01-15 01:36:49 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						e48a987b9c 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into mongodb-ping  
						
						... 
						
						
						
						# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
#	src/pages/EditMonitor.vue 
						
						
							
						
					 
					
						2023-01-15 01:13:11 +08:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						cf21aa3737 
					 
					
						
						
							
							Fix lint  
						
						
						
						
							
						
					 
					
						2023-01-14 16:51:07 +03:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						9890a0754b 
					 
					
						
						
							
							Fix lint  
						
						
						
						
							
						
					 
					
						2023-01-14 16:48:26 +03:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						15c64d458b 
					 
					
						
						
							
							Fix lint  
						
						
						
						
							
						
					 
					
						2023-01-14 16:48:12 +03:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						be850dd596 
					 
					
						
						
							
							Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors  
						
						... 
						
						
						
						# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/languages/en.js 
						
						
							
						
					 
					
						2023-01-14 16:40:13 +03:00 
						 
				 
			
				
					
						
							
							
								Faruk Genç 
							
						 
					 
					
						
						
							
						
						3adc9e65d6 
					 
					
						
						
							
							Add only xml support to http monitors  
						
						
						
						
							
						
					 
					
						2023-01-14 16:33:21 +03:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						712a3c29d4 
					 
					
						
						
							
							Fix Postgres monitor do not handle some error cases correctly  
						
						
						
						
							
						
					 
					
						2023-01-14 21:06:10 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						e9497ac1ab 
					 
					
						
						
							
							Fix knex.js issue  
						
						
						
						
							
						
					 
					
						2023-01-14 20:49:34 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6437ef198f 
					 
					
						
						
							
							Merge pull request  #2541  from long2ice/master  
						
						... 
						
						
						
						feat: support redis monitor 
						
						
							
						
					 
					
						2023-01-14 20:16:53 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						973d5692d0 
					 
					
						
						
							
							Merge pull request  #2604  from black23/patch-1  
						
						... 
						
						
						
						Update cs-CZ.js 
						
						
							
						
					 
					
						2023-01-14 13:04:41 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						468cb004d6 
					 
					
						
						
							
							Merge pull request  #1690  from chakflying/feat/tags-manager  
						
						... 
						
						
						
						Feat: Tags Manager 
						
						
							
						
					 
					
						2023-01-13 23:29:01 +08:00