Tarun Singh 
							
						 
					 
					
						
						
							
						
						7a34103da6 
					 
					
						
						
							
							Added fix to remove children when type changed  
						
						
						
						
					 
					
						2023-06-25 22:44:15 -04:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2b46693995 
					 
					
						
						
							
							Merge pull request  #3239  from madnight/master  
						
						... 
						
						
						
						Fix: prometheus monitor_status metric has 4 values 
						
						
					 
					
						2023-06-13 23:09:29 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c4c3fc81b2 
					 
					
						
						
							
							Merge pull request  #2693  from julian-piehl/group-monitors  
						
						... 
						
						
						
						Group monitors 
						
						
					 
					
						2023-06-11 14:09:02 +08:00 
						 
				 
			
				
					
						
							
							
								Fabian Beuke 
							
						 
					 
					
						
						
							
						
						37ae8eb44a 
					 
					
						
						
							
							Fix: prometheus monitor_status metric has 4 values  
						
						... 
						
						
						
						The prometheus monitor_status metric has actually 4 values. This can easily be verified by looking up the related source code or by using the metric in grafana an see values like 2 (which indicates timeout). 
						
						
					 
					
						2023-06-10 20:22:33 +02:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						58ec53fb1d 
					 
					
						
						
							
							Fix: Try to close mysql connection properly  
						
						
						
						
					 
					
						2023-06-06 20:28:51 +08:00 
						 
				 
			
				
					
						
							
							
								Peace 
							
						 
					 
					
						
						
							
						
						56f448bfe5 
					 
					
						
						
							
							fix: maintenance heredity  
						
						
						
						
					 
					
						2023-05-31 21:29:20 +02:00 
						 
				 
			
				
					
						
							
							
								Peace 
							
						 
					 
					
						
						
							
						
						2b46da0f47 
					 
					
						
						
							
							style: fix linting  
						
						
						
						
					 
					
						2023-05-31 21:19:46 +02:00 
						 
				 
			
				
					
						
							
							
								Peace 
							
						 
					 
					
						
						
							
						
						9bd76c2795 
					 
					
						
						
							
							Merge branch 'master' into group-monitors  
						
						
						
						
					 
					
						2023-05-31 20:51:33 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						343a1d3344 
					 
					
						
						
							
							Merge pull request  #3203  from CommanderStorm/applied_timezone_formatting  
						
						... 
						
						
						
						chore: Made sure that every notification provider uses `timezone`/`localTime` 
						
						
					 
					
						2023-05-30 20:36:32 +08:00 
						 
				 
			
				
					
						
							
							
								Frank Elsinga 
							
						 
					 
					
						
						
							
						
						f3c09f2bbd 
					 
					
						
						
							
							made every Notification provider supply time like dingding after  #3152  
						
						
						
						
					 
					
						2023-05-29 19:24:40 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8ed2b59410 
					 
					
						
						
							
							Resolve conflict  
						
						
						
						
					 
					
						2023-05-26 21:38:51 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						0b8dddba24 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into skaempfe#2593  
						
						... 
						
						
						
						# Conflicts:
#	server/model/monitor.js
#	src/pages/Details.vue 
						
						
					 
					
						2023-05-26 21:32:58 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						bc95875aa0 
					 
					
						
						
							
							Merge pull request  #3156  from maximilian-krauss/feat/add-pushover-ttl  
						
						... 
						
						
						
						feat: Adds message ttl to pushover notification 
						
						
					 
					
						2023-05-26 18:18:24 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						c1efe0f26d 
					 
					
						
						
							
							Add a warning for Node.js >= 20  
						
						
						
						
					 
					
						2023-05-26 18:09:05 +08:00 
						 
				 
			
				
					
						
							
							
								Maximilian Krauß 
							
						 
					 
					
						
						
							
						
						a0d0d5b015 
					 
					
						
						
							
							fix: sends pushover ttl only if defined  
						
						
						
						
					 
					
						2023-05-26 07:27:43 +02:00 
						 
				 
			
				
					
						
							
							
								Maximilian Krauß 
							
						 
					 
					
						
						
							
						
						8d05d80a5f 
					 
					
						
						
							
							feat: Adds message ttl to pushover notification  
						
						
						
						
					 
					
						2023-05-26 07:27:43 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						bb15fa0179 
					 
					
						
						
							
							Merge pull request  #3154  from chakflying/fix/clear-data-remove-worker-thread  
						
						... 
						
						
						
						Fix: Remove use of worker threads in clear-old-data 
						
						
					 
					
						2023-05-16 19:51:20 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8d24891b8e 
					 
					
						
						
							
							Merge pull request  #3054  from TechWilk/keyword-not-found-whitespace  
						
						... 
						
						
						
						Trim before truncating "keword not found" message 
						
						
					 
					
						2023-05-13 18:36:04 +08:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						80c8fd7372 
					 
					
						
						
							
							Chore: Remove util-worker  
						
						
						
						
					 
					
						2023-05-13 01:51:23 +08:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						a27386bb92 
					 
					
						
						
							
							Fix: Use croner for clear-old-data  
						
						
						
						
					 
					
						2023-05-13 00:59:58 +08:00 
						 
				 
			
				
					
						
							
							
								AnnAngela 
							
						 
					 
					
						
						
							
						
						ce70b3fc62 
					 
					
						
						
							
							feat: add a space to separate the words  
						
						
						
						
					 
					
						2023-05-12 22:14:59 +08:00 
						 
				 
			
				
					
						
							
							
								AnnAngela 
							
						 
					 
					
						
						
							
						
						06fba5b55a 
					 
					
						
						
							
							feat: show time as server timezone in dingding notification  
						
						
						
						
					 
					
						2023-05-12 22:04:44 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						7f5d0e5490 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/1.21.X'  
						
						... 
						
						
						
						# Conflicts:
#	package-lock.json 
						
						
					 
					
						2023-05-09 00:42:11 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						0eaaa8b6fa 
					 
					
						
						
							
							Minor  
						
						
						
						
					 
					
						2023-05-08 22:52:41 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						5cd506e340 
					 
					
						
						
							
							Minor  
						
						
						
						
					 
					
						2023-05-08 22:39:32 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						f0beccf6bf 
					 
					
						
						
							
							Fix Same As Server Timezone do not save correctly  
						
						
						
						
					 
					
						2023-05-08 22:14:58 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						72c16c3aa2 
					 
					
						
						
							
							Fix eslint warnings  
						
						
						
						
					 
					
						2023-05-08 04:26:11 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						d23cb0b382 
					 
					
						
						
							
							Fix maintenance do not start after 1.21.2  
						
						
						
						
					 
					
						2023-05-08 04:08:30 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						8207f16396 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization  
						
						
						
						
					 
					
						2023-04-25 18:07:52 +08:00 
						 
				 
			
				
					
						
							
							
								Christopher Wilkinson 
							
						 
					 
					
						
						
							
						
						0e516a42e5 
					 
					
						
						
							
							Trim before truncating "keword not found" message  
						
						
						
						
					 
					
						2023-04-11 16:57:30 +01:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						6356b1e50a 
					 
					
						
						
							
							Merge pull request  #2961  from chakflying/feat/flush-wal  
						
						... 
						
						
						
						Chore: Flush WAL on shutdown 
						
						
					 
					
						2023-04-11 18:53:58 +08:00 
						 
				 
			
				
					
						
							
							
								Josua Frank 
							
						 
					 
					
						
						
							
						
						11f4cb8725 
					 
					
						
						
							
							Merge branch 'louislam:master' into ntfy-bearer-authorization  
						
						
						
						
					 
					
						2023-04-10 16:06:53 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						4c1ac5e870 
					 
					
						
						
							
							Merge pull request  #2863  from mtelgkamp/ntfy-notification-improvements  
						
						... 
						
						
						
						Improve ntfy notifications 
						
						
					 
					
						2023-04-09 16:08:12 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						9e320dc5fb 
					 
					
						
						
							
							Expose timezone and local datetime to notification providers  
						
						
						
						
					 
					
						2023-04-09 16:01:27 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						2f3f929fbd 
					 
					
						
						
							
							Merge pull request  #2831  from mtelgkamp/mattermost-notification-improvements  
						
						... 
						
						
						
						Improve mattermost notifications 
						
						
					 
					
						2023-04-09 15:42:28 +08:00 
						 
				 
			
				
					
						
							
							
								Josua Frank 
							
						 
					 
					
						
						
							
						
						1f7f1f70bf 
					 
					
						
						
							
							Merge branch 'louislam:master' into ntfy-bearer-authorization  
						
						
						
						
					 
					
						2023-04-06 10:55:28 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						21ad715e6a 
					 
					
						
						
							
							Merge pull request  #3021  from louislam/1.22.X  
						
						... 
						
						
						
						1.22.x -> master 
						
						
					 
					
						2023-04-04 14:58:34 +08:00 
						 
				 
			
				
					
						
							
							
								Josua Frank 
							
						 
					 
					
						
						
							
						
						23af66f618 
					 
					
						
						
							
							Merge branch 'louislam:master' into ntfy-bearer-authorization  
						
						
						
						
					 
					
						2023-04-03 21:17:53 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						45ef7b2f69 
					 
					
						
						
							
							Fix Effective Date Range cannot be removed  
						
						
						
						
					 
					
						2023-04-03 21:01:58 +08:00 
						 
				 
			
				
					
						
							
							
								Josua Frank 
							
						 
					 
					
						
						
							
						
						6b078b83bd 
					 
					
						
						
							
							Merge branch 'master' into ntfy-bearer-authorization  
						
						
						
						
					 
					
						2023-04-03 08:33:05 +02:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						1be74e2720 
					 
					
						
						
							
							Merge pull request  #2870  from chakflying/feat/auto-theme-status-page  
						
						... 
						
						
						
						Feat: Support auto theme in status pages 
						
						
					 
					
						2023-04-03 02:38:30 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						32f84b5e4e 
					 
					
						
						
							
							Merge pull request  #2491  from RubenNL/fix-metrics-push  
						
						... 
						
						
						
						Fixed the metrics for the push type. 
						
						
					 
					
						2023-04-02 02:05:03 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						dbfaddafca 
					 
					
						
						
							
							Validate cron before submit  
						
						
						
						
					 
					
						2023-04-01 16:30:55 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						511038b45a 
					 
					
						
						
							
							Remove unused code  
						
						
						
						
					 
					
						2023-04-01 04:22:10 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						17ae47d091 
					 
					
						
						
							
							Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.  
						
						
						
						
					 
					
						2023-04-01 00:58:23 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						de0d1edfd4 
					 
					
						
						
							
							Merge pull request  #2988  from chakflying/fix/socks-rejectUnauthorized  
						
						... 
						
						
						
						Fix: Pass rejectUnauthorized to Socks Proxy 
						
						
					 
					
						2023-04-01 00:48:28 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						524cf7c607 
					 
					
						
						
							
							WIP  
						
						
						
						
					 
					
						2023-03-31 21:34:05 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						227cec86a8 
					 
					
						
						
							
							WIP  
						
						
						
						
					 
					
						2023-03-31 20:25:37 +08:00 
						 
				 
			
				
					
						
							
							
								Louis Lam 
							
						 
					 
					
						
						
							
						
						02291730fe 
					 
					
						
						
							
							WIP  
						
						
						
						
					 
					
						2023-03-31 04:04:17 +08:00 
						 
				 
			
				
					
						
							
							
								Nelson Chan 
							
						 
					 
					
						
						
							
						
						8ee4b844fd 
					 
					
						
						
							
							Fix: Pass rejectUnauthorized to Socks Proxy  
						
						
						
						
					 
					
						2023-03-28 11:40:19 +08:00