knova 
								
							 
						 
						
							
							
							
							
								
							
							
								13d943667e 
								
							 
						 
						
							
							
								
								Changed references of "Pleroma" to "Akkoma" in email text  
							
							... 
							
							
							
							I know this is probably small peanuts in the grand scheme of things, but it bugged me when I was messing around with my own Akkoma instance. 
							
						 
						
							2023-01-08 03:29:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									FloatingGhost 
								
							 
						 
						
							
							
							
							
								
							
							
								affc910372 
								
							 
						 
						
							
							
								
								Remove hackney/gun in favour of finch  
							
							
							
						 
						
							2022-12-11 19:19:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
							
							
								
							
							
								7726148472 
								
							 
						 
						
							
							
								
								Send emails i18n'd using backend-stored user language  
							
							
							
						 
						
							2022-06-29 20:45:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tusooa Zhu 
								
							 
						 
						
							
							
							
							
								
							
							
								c301a95276 
								
							 
						 
						
							
							
								
								Make all emails translatable  
							
							
							
						 
						
							2022-06-29 20:45:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								028017711c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-email  
							
							
							
						 
						
							2021-06-01 16:17:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9879c18548 
								
							 
						 
						
							
							
								
								Avoid use Phoenix.Swoosh to prevent recompiling the Endpoint  
							
							... 
							
							
							
							Speeds up recompilation by fixing cycles in UserEmail 
							
						 
						
							2021-06-01 16:17:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0  
							
							... 
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 
						
							2021-05-31 16:48:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4cacce4b42 
								
							 
						 
						
							
							
								
								Revert "Add plaintext support for all emails except the digest"  
							
							... 
							
							
							
							This reverts commit 5df9f68392 
							
						 
						
							2021-02-08 16:39:55 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0368419fce 
								
							 
						 
						
							
							
								
								Slightly better formatting  
							
							
							
						 
						
							2021-02-05 09:13:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								5df9f68392 
								
							 
						 
						
							
							
								
								Add plaintext support for all emails except the digest  
							
							
							
						 
						
							2021-02-05 09:13:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e945ccc91b 
								
							 
						 
						
							
							
								
								Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled  
							
							
							
						 
						
							2021-02-04 15:16:50 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2956c21a55 
								
							 
						 
						
							
							
								
								Improve confirmation email language  
							
							
							
						 
						
							2021-02-04 15:10:43 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f 
								
							 
						 
						
							
							
								
								Bump Copyright to 2021  
							
							... 
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;' 
							
						 
						
							2021-01-13 07:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e1e7e4d379 
								
							 
						 
						
							
							
								
								Object: Rework how Object.normalize works  
							
							... 
							
							
							
							Now it defaults to not fetching, and the option is named. 
							
						 
						
							2021-01-04 13:38:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80891e83d8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-12-17 09:05:36 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								cebe3c7def 
								
							 
						 
						
							
							
								
								Fix for dropping posts/notifs in WS when mix task is executed  
							
							... 
							
							
							
							- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app) 
							
						 
						
							2020-12-14 11:02:32 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								30ed7b502f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-21 10:23:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2bf6b1f7e 
								
							 
						 
						
							
							
								
								fix for forwarded reports  
							
							
							
						 
						
							2020-11-19 09:53:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9546c1444c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into registration-workflow  
							
							
							
						 
						
							2020-11-14 19:48:47 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6d850c46dc 
								
							 
						 
						
							
							
								
								AdminEmail: Use AP id as user url.  
							
							
							
						 
						
							2020-11-04 17:12:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								1fb9452131 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/account-export  
							
							
							
						 
						
							2020-10-14 15:27:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								28005563f0 
								
							 
						 
						
							
							
								
								Send approval pending email during registration  
							
							
							
						 
						
							2020-10-11 20:50:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3ca98878d2 
								
							 
						 
						
							
							
								
								Deep link to the user account in AdminFE in account confirmation emails  
							
							
							
						 
						
							2020-10-09 17:08:05 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8baee855d9 
								
							 
						 
						
							
							
								
								Fix emails  
							
							
							
						 
						
							2020-10-07 18:35:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c22c9afb4 
								
							 
						 
						
							
							
								
								Allow admins request user backups  
							
							
							
						 
						
							2020-10-07 18:34:31 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fdd81d000 
								
							 
						 
						
							
							
								
								Add "Your backup is ready" email  
							
							
							
						 
						
							2020-10-07 18:34:30 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8b6ac45f3c 
								
							 
						 
						
							
							
								
								Allow emails to be sent again,  #2101   #2172  
							
							... 
							
							
							
							https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707  
						
							2020-09-21 13:28:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4727030f59 
								
							 
						 
						
							
							
								
								fixes for mix tasks  
							
							... 
							
							
							
							- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task 
							
						 
						
							2020-08-19 11:06:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f688c8df82 
								
							 
						 
						
							
							
								
								Fix User.registration_reason HTML sanitizing issues  
							
							
							
						 
						
							2020-07-27 20:36:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6747bf2e16 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into by-approval  
							
							
							
						 
						
							2020-07-27 12:29:18 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3edaecae96 
								
							 
						 
						
							
							
								
								added welcome email  
							
							
							
						 
						
							2020-07-21 09:25:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0d004a9d04 
								
							 
						 
						
							
							
								
								Email admins when a new unapproved account is up for review  
							
							
							
						 
						
							2020-07-14 20:31:20 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2b979cc90c 
								
							 
						 
						
							
							
								
								Add AdminFE reports URL to report emails  
							
							
							
						 
						
							2020-07-09 11:55:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d23804f191 
								
							 
						 
						
							
							
								
								Use the Pleroma.Config alias  
							
							
							
						 
						
							2020-07-09 10:53:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								b7fc61e17b 
								
							 
						 
						
							
							
								
								Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE  
							
							
							
						 
						
							2020-05-21 04:41:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05da5f5cca 
								
							 
						 
						
							
							
								
								Update Copyrights  
							
							
							
						 
						
							2020-03-03 16:44:49 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a 
							
						 
						
							2020-03-02 06:08:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								50d9fcbe29 
								
							 
						 
						
							
							
								
								Hotlink logo instead of attachment  
							
							
							
						 
						
							2020-02-11 23:33:05 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6875ccb6bf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/new-registrations-digest  
							
							
							
						 
						
							2020-02-11 13:54:55 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								12b6fcdb8c 
								
							 
						 
						
							
							
								
								Merge branch 'features/task-test-email' into 'develop'  
							
							... 
							
							
							
							Create pleroma.email mix task
Closes  #1061 
See merge request pleroma/pleroma!2118  
							
						 
						
							2020-01-28 16:42:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4eb935be78 
								
							 
						 
						
							
							
								
								Create pleroma.email mix task  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061  
							
						 
						
							2020-01-28 16:49:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df0b8f1d08 
								
							 
						 
						
							
							
								
								Add new users digest email  
							
							
							
						 
						
							2020-01-22 20:31:42 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								22fc271e23 
								
							 
						 
						
							
							
								
								init tag feed  
							
							
							
						 
						
							2019-12-06 09:33:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3f77a99f 
								
							 
						 
						
							
							
								
								Extract RSS Feed functionality from OStatus  
							
							
							
						 
						
							2019-10-07 12:20:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1d8e956c32 
								
							 
						 
						
							
							
								
								Use the user.id instead of nickname in report URLs  
							
							... 
							
							
							
							Ensures links to profiles of remote users work. 
							
						 
						
							2019-10-06 14:13:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								dd017c65a4 
								
							 
						 
						
							
							
								
								[ #1149 ] Refactored Oban workers API (introduced enqueue/3).  
							
							
							
						 
						
							2019-08-31 21:58:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a90ea8ba15 
								
							 
						 
						
							
							
								
								[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).  
							
							
							
						 
						
							2019-08-31 19:08:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								256ff09aa8 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 
						
							2019-08-22 20:59:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								158231cd20 
								
							 
						 
						
							
							
								
								Add configurable colors and logo for the digest template  
							
							
							
						 
						
							2019-08-16 18:32:25 +07:00