Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								158231cd20
								
							
						 | 
						
							
							
								
								Add configurable colors and logo for the digest template
							
							
							
							
							
						 | 
						
							2019-08-16 18:32:25 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c9970feee2
								
							
						 | 
						
							
							
								
								Fix compatibility with Elixir 1.8
							
							
							
							
							
						 | 
						
							2019-08-14 21:03:25 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b7f1c6995
								
							
						 | 
						
							
							
								
								Improve digest email template
							
							
							
							
							
						 | 
						
							2019-08-14 20:46:05 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								657277ffc0
								
							
						 | 
						
							
							
								
								Resolve conflicts
							
							
							
							
							
						 | 
						
							2019-06-29 00:52:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0c4ebb4d7
								
							
						 | 
						
							
							
								
								[#184] small refactoring  reset password
							
							
							
							
							
						 | 
						
							2019-06-24 19:01:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e17610587
								
							
						 | 
						
							
							
								
								Add task to test emails
							
							
							
							
							
						 | 
						
							2019-06-04 02:48:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								64a2c6a041
								
							
						 | 
						
							
							
								
								Digest emails
							
							
							
							
							
						 | 
						
							2019-04-20 19:42:19 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								c349573791
								
							
						 | 
						
							
							
								
								Merge develop to 788-separate-email-addresses
							
							
							
							
							
							
							
							Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs 
							
						 | 
						
							2019-04-13 12:24:38 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								a64eb2b389
								
							
						 | 
						
							
							
								
								fallback to the old behaviour
							
							
							
							
							
							
							
							admin and user mailers 
							
						 | 
						
							2019-04-13 12:20:36 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe13a1d78c
								
							
						 | 
						
							
							
								
								adding notify_email setting for trigger emails
							
							
							
							
							
						 | 
						
							2019-04-10 17:57:41 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9c1b36856b
								
							
						 | 
						
							
							
								
								s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
							
							
							
							
							
						 | 
						
							2019-04-10 06:33:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f69cbf4755
								
							
						 | 
						
							
							
								
								[#114] Added :user_id component to email confirmation path to improve the security.
							
							
							
							
							
							
							
							Added tests for `confirm_email` action. 
							
						 | 
						
							2018-12-20 13:41:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								1de0aa2f10
								
							
						 | 
						
							
							
								
								[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
							
							
							
							
							
						 | 
						
							2018-12-18 17:21:05 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								07e93f9940
								
							
						 | 
						
							
							
								
								[#114] Improved tests.
							
							
							
							
							
						 | 
						
							2018-12-14 13:52:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cbf16a5fe
								
							
						 | 
						
							
							
								
								[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
							
							
							
							
							
						 | 
						
							2018-12-14 12:28:22 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc83d7ffe7
								
							
						 | 
						
							
							
								
								[#114] Naive implementation of email invitations.
							
							
							
							
							
						 | 
						
							2018-12-14 12:28:14 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e689de063
								
							
						 | 
						
							
							
								
								[#114] Removed email_invite implementation (to be addressed separately).
							
							
							
							
							
						 | 
						
							2018-12-13 16:24:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								00744c6b03
								
							
						 | 
						
							
							
								
								[#114] Initial implementation of user email invitations.
							
							
							
							
							
						 | 
						
							2018-12-13 14:30:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5afb11032
								
							
						 | 
						
							
							
								
								[#114] Initial implementation of user password reset emails (user-initiated).
							
							
							
							
							
						 | 
						
							2018-12-12 17:04:39 +03:00 | 
						
						
							
							
							
								
							
							
						 |