23 Commits

Author	SHA1	Message	Date
Mark Felder	4695bdd81b	Merge branch 'develop' into issue/1790-updated-oban	2020-07-03 10:36:41 -05:00
Maksim Pechnikov	a8d967762e	migrate to oban 2.0-rc1	2020-06-23 15:09:01 +03:00
Alexander Strizhakov	b66e6eb521	fixes for tests	2020-06-16 19:03:45 +03:00
Egor Kislitsyn	a7627bdc7a	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-06-01 15:48:51 +04: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
Egor Kislitsyn	7803a85d2c	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
Egor Kislitsyn	fc2eb1fbd6	Fix formatter warnings	2020-03-20 22:16:57 +04:00
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	2020-03-20 22:08:34 +04:00
Ivan Tashkinov	1c05f539aa	Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).	2020-03-20 18:33:00 +03:00
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-12 16:02:24 +04:00
lain	6f7a8c43a2	Merge branch 'fix/no-email-no-fail' into 'develop' ... Do not fail when user has no email See merge request pleroma/pleroma!2249	2020-03-04 12:43:06 +00:00
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-03 00:32:34 +04:00
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	2020-03-02 06:08:45 +01:00
Egor Kislitsyn	cb60a9c42f	Do not fail when user has no email	2020-02-27 17:27:49 +04:00
Egor Kislitsyn	819cd46717	Auto-expire Create activities only	2020-02-20 22:04:02 +04: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
Maksim Pechnikov	ce7c887a27	removed try/rescue	2020-01-23 11:05:08 +03:00
Egor Kislitsyn	b6f5b326e7	Fix credo warnings	2020-01-22 20:59:58 +04:00
Egor Kislitsyn	df0b8f1d08	Add new users digest email	2020-01-22 20:31:42 +04:00
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	2019-12-04 09:12:17 +03:00
Maksim Pechnikov	1403a1441d	added tests	2019-11-28 09:02:23 +03:00
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	2019-11-27 15:59:13 +03:00