304 commits

Author	SHA1	Message	Date
Roman Chvanikov	b87ad13803	Move comments for email_notifications config to docs	2019-04-21 19:36:31 +07:00
Roman Chvanikov	64a2c6a041	Digest emails	2019-04-20 19:42:19 +07:00
Roman Chvanikov	73407f4eea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-19 23:27:13 +07:00
Roman Chvanikov	aeafa0b2ef	Add Notification.for_user_since/2	2019-04-19 22:16:17 +07:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
Roman Chvanikov	2f0203a4a1	Resolve conflicts	2019-04-17 16:59:05 +07:00
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	2019-04-16 18:44:07 +00:00
Hakurei Reimu	10096bbf2b	add extra_cookie_attrs option to config ... Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.	2019-04-16 22:20:56 +08:00
lain	4fecd6f9a7	Config.exs: Add big warning so that nobody ever edits it.	2019-04-15 15:45:15 +02: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	fe13a1d78c	adding notify_email setting for trigger emails	2019-04-10 17:57:41 +07:00
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	2019-04-08 09:18:01 +00:00
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07:00
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Mark Felder	66e7b03372	Merge branch 'develop' into feature/prometheus	2019-04-04 15:39:42 -05:00
feld	3b12eeda19	Add ability to ship logs to a Slack channel	2019-04-04 19:52:22 +00:00
Mark Felder	7222afe01b	Clean merge crumbs	2019-04-04 12:29:10 -05:00
href	7e930559fe	Serve metrics at /api/pleroma/app_metrics	2019-04-04 12:27:44 -05:00
Egor Kislitsyn	0b5c818cb7	[#1] fix telemetry	2019-04-04 11:35:09 -05:00
href	bc3618a38d	Set up telemetry and prometheus	2019-04-04 11:30:43 -05:00
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	2019-04-04 16:10:43 +07:00
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	2019-04-02 19:16:29 +07:00
Ivan Tashkinov	590c935d95	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-02 13:50:12 +03:00
Alex S	08d64b977f	little changes and typos	2019-04-02 16:13:34 +07:00
Alex S	9b2188da7c	refactoring of emoji tags config to use groups	2019-04-02 15:44:56 +07:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
Ivan Tashkinov	baffdcc480	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-01 08:49:32 +03:00
Mark Felder	d5a1e08bf1	Add default mail adapter settings to config	2019-03-31 17:46:17 -05:00
Egor	9a39d1d846	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
Ivan Tashkinov	20e0f36605	Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth	2019-03-27 15:41:40 +03:00
Ivan Tashkinov	2a95014b9d	[#923] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +03:00
kaniini	1c3d3d0c2b	Merge branch 'safe-mentions' into 'develop' ... Add safe dm mode option. See merge request pleroma/pleroma!958	2019-03-22 00:50:24 +00:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Ivan Tashkinov	81bf6d9e6a	[#923] Typo fix.	2019-03-20 20:29:08 +03:00
Ivan Tashkinov	af68a42ef7	[#923] Support for multiple OAuth consumer strategies.	2019-03-20 20:25:48 +03:00
rinpatch	9a7b817c9a	Ecto 3.0.5 migration ... kms	2019-03-20 15:59:54 +03:00
Ivan Tashkinov	26b6354095	[#923] Support for multiple (external) registrations per user via Registration.	2019-03-18 17:23:38 +03:00
Ivan Tashkinov	2a96283efb	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex	2019-03-18 10:26:41 +03:00