Josua Frank
							
						 
					 | 
					
						
						
							
						
						6b078b83bd
					 | 
					
						
						
							
							Merge branch 'master' into ntfy-bearer-authorization
						
						
						
						
						
						
					 | 
					
						2023-04-03 08:33:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						b975c24531
					 | 
					
						
						
							
							UI: Improve design on mobile
						
						
						
						
						
						
					 | 
					
						2023-03-31 21:54:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						a6acd065bb
					 | 
					
						
						
							
							WIP
						
						
						
						
						
						
					 | 
					
						2023-03-31 20:58:45 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josua Frank
							
						 
					 | 
					
						
						
							
						
						fc4312ca1a
					 | 
					
						
						
							
							Merge branch 'master' into ntfy-bearer-authorization
						
						
						
						
						
						
					 | 
					
						2023-03-26 19:09:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						4869e6531c
					 | 
					
						
						
							
							Merge pull request #2980 from Genc/feature/twilio-notification-provider
						
						
						
						
						
						
						
						Add Twilio Sms Notification Provider 
						
						
					 | 
					
						2023-03-26 15:38:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						302b9cf644
					 | 
					
						
						
							
							Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
						
						
						
						
						
						
						
						Feat: Add opsgenie notification provider 
						
						
					 | 
					
						2023-03-26 15:36:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Faruk Genç
							
						 
					 | 
					
						
						
							
						
						b64c835cee
					 | 
					
						
						
							
							Add Twilio Sms Notification Provider
						
						
						
						
						
						
					 | 
					
						2023-03-25 19:56:01 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						b6169408be
					 | 
					
						
						
							
							Merge pull request #2962 from chakflying/fix/missing-clear-form
						
						
						
						
						
						
						
						Fix: Add missing clearForm func. 
						
						
					 | 
					
						2023-03-25 14:31:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						a2014278b8
					 | 
					
						
						
							
							Fix #2969
						
						
						
						
						
						
					 | 
					
						2023-03-24 19:16:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						4c9d7ac8ca
					 | 
					
						
						
							
							Fix: Add missing clearForm func.
						
						
						
						
						
						
					 | 
					
						2023-03-22 15:06:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niclas.koegl
							
						 
					 | 
					
						
						
							
						
						d9558833fc
					 | 
					
						
						
							
							Fix linting
						
						
						
						
						
						
					 | 
					
						2023-03-21 19:45:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niclas.koegl
							
						 
					 | 
					
						
						
							
						
						776a482a1d
					 | 
					
						
						
							
							Add Opsgenie notification provider
						
						
						
						
						
						
					 | 
					
						2023-03-21 19:29:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niclas.koegl
							
						 
					 | 
					
						
						
							
						
						d2527d7254
					 | 
					
						
						
							
							Merge branch 'master' into feature/opsgenie-alerts
						
						
						
						
						
						
					 | 
					
						2023-03-21 18:10:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								niclas.koegl
							
						 
					 | 
					
						
						
							
						
						6dfca0c163
					 | 
					
						
						
							
							Add Opsgenie notification provider
						
						
						
						
						
						
					 | 
					
						2023-03-21 18:07:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josua Frank
							
						 
					 | 
					
						
						
							
						
						df47609671
					 | 
					
						
						
							
							Added default dropdown value
						
						
						
						
						
						
					 | 
					
						2023-03-21 13:55:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josua Frank
							
						 
					 | 
					
						
						
							
						
						e63f7562f8
					 | 
					
						
						
							
							linter fixes
						
						
						
						
						
						
					 | 
					
						2023-03-21 13:48:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josua Frank
							
						 
					 | 
					
						
						
							
						
						35a56dd9e0
					 | 
					
						
						
							
							Added dropdown for authentication methods
						
						
						
						
						
						
					 | 
					
						2023-03-21 13:40:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josua Frank
							
						 
					 | 
					
						
						
							
						
						442f54de84
					 | 
					
						
						
							
							Merge branch 'louislam:master' into ntfy-bearer-authorization
						
						
						
						
						
						
					 | 
					
						2023-03-21 13:01:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								401Unauthorized
							
						 
					 | 
					
						
						
							
						
						e5a6238cde
					 | 
					
						
						
							
							chore: remove invalid template
						
						
						
						
						
						
					 | 
					
						2023-03-19 21:59:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yoswaris Lawpaiboon
							
						 
					 | 
					
						
						
							
						
						29b2809279
					 | 
					
						
						
							
							Change Icon, Add missing var
						
						
						
						
						
						
					 | 
					
						2023-03-10 22:04:47 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yoswaris Lawpaiboon
							
						 
					 | 
					
						
						
							
						
						16f2701f61
					 | 
					
						
						
							
							idk how to fix camelcase lint 😢
						
						
						
						
						
						
					 | 
					
						2023-03-10 20:24:10 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Yoswaris Lawpaiboon
							
						 
					 | 
					
						
						
							
						
						3bbf269da0
					 | 
					
						
						
							
							generator modal
						
						
						
						
						
						
					 | 
					
						2023-03-10 19:25:04 +07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						ba7af9b569
					 | 
					
						
						
							
							Uppercase and improve language keys
						
						
						
						
						
						
					 | 
					
						2023-03-10 15:55:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						6e0aa109bc
					 | 
					
						
						
							
							Uppercase and improve language keys
						
						
						
						
						
						
					 | 
					
						2023-03-10 15:36:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Josua Frank
							
						 
					 | 
					
						
						
							
						
						e8814e8479
					 | 
					
						
						
							
							added option for ntfy access tokens
						
						
						
						
						
						
					 | 
					
						2023-03-08 13:28:02 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								cyril59310
							
						 
					 | 
					
						
						
							
						
						70bb69fc73
					 | 
					
						
						
							
							add keys for translation
						
						
						
						
						
						
					 | 
					
						2023-03-04 15:17:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						8d1847c032
					 | 
					
						
						
							
							Merge pull request #2744 from bobby-ore/add-lunasea-user-id
						
						
						
						
						
						
						
						Add ability to use User ID for LunaSea notifications 
						
						
					 | 
					
						2023-03-04 17:35:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nelson Chan
							
						 
					 | 
					
						
						
							
						
						beb22f743d
					 | 
					
						
						
							
							Chore: Update chart.js & improve perf.
						
						
						
						
						
						
					 | 
					
						2023-03-02 04:47:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						71c800b880
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
						
						
						
						
						
						
						
						# Conflicts:
#	src/lang/en.json 
						
						
					 | 
					
						2023-03-01 16:17:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Bobby Ore
							
						 
					 | 
					
						
						
							
						
						b21c2adcc2
					 | 
					
						
						
							
							Rework lunasea notification to allow for device id and user id
						
						
						
						
						
						
					 | 
					
						2023-02-28 09:47:35 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						38ab5e0f3e
					 | 
					
						
						
							
							Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
						
						
						
						
						
						
						
						Added #1685: Add API keys for API authentication 
						
						
					 | 
					
						2023-02-28 16:55:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Nickson
							
						 
					 | 
					
						
						
							
						
						7e178d93df
					 | 
					
						
						
							
							Moved location of disable expiry checkbox
						
						
						
						
						
						
						
						Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com> 
						
						
					 | 
					
						2023-02-27 18:44:32 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Nickson
							
						 
					 | 
					
						
						
							
						
						97e276bdb5
					 | 
					
						
						
							
							Fixed processing error with add API key
						
						
						
						
						
						
						
						Also added padding below add button
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com> 
						
						
					 | 
					
						2023-02-27 18:19:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthew Nickson
							
						 
					 | 
					
						
						
							
						
						11fa690e09
					 | 
					
						
						
							
							Updated API Keys UI
						
						
						
						
						
						
						
						The UI has now been moved to the settings page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com> 
						
						
					 | 
					
						2023-02-26 18:07:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						ea3b3abe36
					 | 
					
						
						
							
							Fine tune
						
						
						
						
						
						
					 | 
					
						2023-02-25 20:13:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						7f9332c753
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
						
						
						
						
						
						
						
						# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/icon.js
#	src/languages/en.js
#	src/languages/es-ES.js 
						
						
					 | 
					
						2023-02-25 19:14:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						f0ae67f89a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
						
						
						
						
						
						
						
						# Conflicts:
#	src/languages/en.js
#	src/pages/EditMonitor.vue 
						
						
					 | 
					
						2023-02-25 14:56:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						98bb854832
					 | 
					
						
						
							
							Merge pull request #2764 from chakflying/feat/add-new-tag
						
						
						
						
						
						
						
						Feat: Add "Add New Tag" button in settings 
						
						
					 | 
					
						2023-02-25 02:27:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						ef64077980
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
						
						
						
						
						
						
						
						# Conflicts:
#	src/lang/en.json 
						
						
					 | 
					
						2023-02-25 00:06:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						af82ea742c
					 | 
					
						
						
							
							Merge manually
						
						
						
						
						
						
					 | 
					
						2023-02-24 17:21:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						e9475ed3c0
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into telegram_test
						
						
						
						
						
						
						
						# Conflicts:
#	server/notification-providers/telegram.js
#	src/languages/en.js 
						
						
					 | 
					
						2023-02-24 17:08:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						06278dc51f
					 | 
					
						
						
							
							Fix telegram silent issue
						
						
						
						
						
						
					 | 
					
						2023-02-24 17:03:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						10228874fa
					 | 
					
						
						
							
							Merge manually
						
						
						
						
						
						
					 | 
					
						2023-02-24 16:54:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c5034c8f38
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into nlutsenko.telegram_silentnotification
						
						
						
						
						
						
						
						# Conflicts:
#	server/notification-providers/telegram.js
#	src/components/notifications/Telegram.vue
#	src/languages/en.js 
						
						
					 | 
					
						2023-02-24 16:42:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						7e3734af53
					 | 
					
						
						
							
							Better handling
						
						
						
						
						
						
					 | 
					
						2023-02-23 20:59:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						5789112f55
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction
						
						
						
						
						
						
					 | 
					
						2023-02-23 20:47:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						fa7f75a930
					 | 
					
						
						
							
							Organize notification list
						
						
						
						
						
						
					 | 
					
						2023-02-23 18:01:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						7da48b27a5
					 | 
					
						
						
							
							Fix getUniqueDefaultName
						
						
						
						
						
						
					 | 
					
						2023-02-22 04:29:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |