| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a180c1360e | [#1149] Oban mailer job. Adjusted tests. | 2019-08-14 21:42:21 +03: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 |  | 
				
					
						| 
								
								
									 lain | 29807ef6a5 | Merge branch 'feature/digest-email' into 'develop' Feature/digest email
See merge request pleroma/pleroma!1078 | 2019-08-08 14:38:33 +00:00 |  | 
				
					
						| 
								
								
									 Eugenij | 96028cd585 | Remove Reply-To from report emails | 2019-08-04 22:24:50 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | eae991b06a | merge develop | 2019-07-12 18:08:27 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 12b1454245 | [#1062] added option to disable send email | 2019-07-10 05:34:21 +00: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 | ce47017c89 | Merge develop | 2019-05-29 18:18:22 +03:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | e2b3a27204 | Add Reports to Admin API | 2019-05-16 19:09:18 +00: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 | cae0231731 | s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/ | 2019-04-10 06:33:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 1791ee8ec4 | s/Pleroma.Mailer/Pleroma.Emails.Mailer/ | 2019-04-10 06:33:19 +02:00 |  | 
				
					
						| 
								
								
									 Egor | 9a39d1d846 | Replace Pleroma.Jobs with pleroma_job_queue | 2019-03-29 12:46:05 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 27e03a2177 | reports: fix up email generation for remote reports | 2019-03-22 01:17:14 +00:00 |  | 
				
					
						| 
								
								
									 Egor | bff9eb5ef7 | Reports | 2019-02-20 16:51:25 +00: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_inviteimplementation (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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 10c156d98f | [#114] SMTP deps and config. | 2018-12-12 17:01:34 +03:00 |  |