Louis Lam
							
						 
					 | 
					
						
						
							
						
						fd15e7c2dc
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into ntfy-icon
						
						
						
						
						
						
						
						# Conflicts:
#	server/notification-providers/ntfy.js
#	src/components/notifications/Ntfy.vue
#	src/languages/en.js 
						
						
					 | 
					
						2022-10-31 17:10:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Meis
							
						 
					 | 
					
						
						
							
						
						1e8a16504b
					 | 
					
						
						
							
							Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
						
						
						
						
						
						
					 | 
					
						2022-10-11 11:15:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Louis Lam
							
						 
					 | 
					
						
						
							
						
						c24b64921d
					 | 
					
						
						
							
							Fix #2183 ntfy issue
						
						
						
						
						
						
					 | 
					
						2022-10-06 23:28:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Meis
							
						 
					 | 
					
						
						
							
						
						e12642cf21
					 | 
					
						
						
							
							Fix double quotes in fallback for no icon url in ntfy notification provider settings
						
						
						
						
						
						
					 | 
					
						2022-09-28 10:24:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Meis
							
						 
					 | 
					
						
						
							
						
						6f86236b63
					 | 
					
						
						
							
							Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today)
						
						
						
						
						
						
					 | 
					
						2022-09-28 10:13:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rolf Bachmann
							
						 
					 | 
					
						
						
							
						
						c4a2ce4e78
					 | 
					
						
						
							
							Add authentication support for ntfy
						
						
						
						
						
						
					 | 
					
						2022-07-19 12:17:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Dormann
							
						 
					 | 
					
						
						
							
						
						54184350a4
					 | 
					
						
						
							
							fix: missing semicolons
						
						
						
						
						
						
					 | 
					
						2022-05-23 21:13:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Dormann
							
						 
					 | 
					
						
						
							
						
						14dbe7c334
					 | 
					
						
						
							
							clean up + default ntfs.sh server url
						
						
						
						
						
						
					 | 
					
						2022-05-23 21:11:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Philipp Dormann
							
						 
					 | 
					
						
						
							
						
						71f031c14e
					 | 
					
						
						
							
							add ntfy support
						
						
						
						
						
						
						
						ref https://github.com/louislam/uptime-kuma/issues/1622 
						
						
					 | 
					
						2022-05-23 10:55:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |