13723 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	c64eae40a2	ObjectAgePolicy: Fix pattern matching on published	2021-08-10 07:41:06 +02:00
Haelwenn	901204df22	Merge branch 'poll-notification' into 'develop' ... MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484	2021-08-09 10:02:37 +00:00
Haelwenn	6384d78035	Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop' ... Simple policy reasons for instance specific policies See merge request pleroma/pleroma!3314	2021-08-09 09:37:59 +00:00
Haelwenn	c45b3bde94	Merge branch 'chores/2.4.0-develop' into 'develop' ... Mergeback: 2.4.0 See merge request pleroma/pleroma!3494	2021-08-08 14:40:51 +00:00
Haelwenn (lanodan) Monnier	8f730f70cb	mix.exs: 2.4.50	2021-08-08 16:00:10 +02:00
Haelwenn (lanodan) Monnier	0910777d41	Update PleromaFE Bundle (2.4.0) ... based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9	2021-08-08 15:21:21 +02:00
matildepark	469405b7b2	CHANGELOG.md: Fix instances of 2020 being actually 2021	2021-08-06 08:42:27 +02:00
Egor Kislitsyn	ad09bdb376	Improve readability	2021-08-06 07:59:54 +02:00
Ilja	ee26f2c91b	Quarantine placeholders ... * kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case * The mrf simple and transparency exclusion were already OK	2021-08-06 07:59:54 +02:00
Ilja	cd706c0335	improve changelog entry	2021-08-06 07:59:54 +02:00
Ilja	b0926a71b2	Make transparency_exclusions use tuples in admin-fe ... * Make it use tuples * I also changed the keys for key_placeholder and value_placeholder to use snake_case instead of camelCase	2021-08-06 07:59:53 +02:00
Ilja	f4028c908c	Add key- and valuePlaceholders for quarantined_instances and mrf_simple ... * I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here * I also added comments to explain why we did the _info keys (backwards compatibility)	2021-08-06 07:59:53 +02:00
Ilja	9418424048	Add transparency_exclusions also to the breaking changes	2021-08-06 07:59:53 +02:00
Ilja	506bf16363	Change docs ... * ./configuration/mrf.md * Change example * ./configuration/cheatsheet.md * Change descriptions to include that a reason is given * CHANGELOG.md * Add as breaking change	2021-08-06 07:59:53 +02:00
Ilja	03030b47c2	quarantine instances info ... Added a new field in the nodeinfo called quarantined_instances_info This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`	2021-08-06 07:59:53 +02:00
Ilja	47fc57bbcc	Change what nodeinfo returns without breaking backwards compatibility ... * Only for SimplePolicy for now * I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info	2021-08-06 07:59:53 +02:00
Ilja	7fdc3cde06	Return maps in node_info ... It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE, but for FE maps like %{"instance": "instance", "reason", "reason"} are better. I changed it so that node_info returns maps now for simple_policy and quarantined instances.	2021-08-06 07:59:53 +02:00
Ilja	1f52246a02	Add database migrations ... * SimplePolicy * quarentine * transparency_exclusions	2021-08-06 07:59:53 +02:00
Ilja	c0489f9fac	Fixed deprecation warning checks ... When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.	2021-08-06 07:59:53 +02:00
Ilja	64002e92ad	config/description.exs: Update quarantine settings to tuples	2021-08-06 07:59:53 +02:00
Ilja	b674ba658b	make linter happy	2021-08-06 07:59:52 +02:00
Ilja	3c5a497b19	Deprecate transparency_exclusions ... * Give deprecation message * Rewrite configs	2021-08-06 07:59:52 +02:00
Ilja	dfeb3862da	config :mrf, :transparency_exclusions works with tumples now	2021-08-06 07:59:52 +02:00
Ilja	e0c7d77197	Deprecate and rewrite settings for quarentine settings ... * This is for the settings, not yet a DB migration	2021-08-06 07:59:52 +02:00
Ilja	27fe7b0274	Make quarentine work with list of tuples instead of strings	2021-08-06 07:59:52 +02:00
Ilja	dd947d9bc8	Add tests for setting :instance, :quarantined_instances ... No test was done for quarantined instances yet. I added a factory for followers_only notes and checked * That no followers only post is send when the target server is quarantined * That a followers only post is send when the target server is not quarantined	2021-08-06 07:59:52 +02:00
Ilja	4ba0beb60c	Make mrfSimple work with tuples ... * Changed SimplePolicy * I also grepped in test/ for ':mrf_simple' to see what other things could be affected	2021-08-06 07:58:58 +02:00
Ilja	647087d7fd	Deprectate strings for SimplePolicy ... When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead	2021-08-06 05:01:44 +02:00
Haelwenn	5f5dc24027	Merge branch 'staff-plug' into 'develop' ... Moderators: add UserIsStaffPlug See merge request pleroma/pleroma!3495	2021-08-05 05:51:22 +00:00
Alex Gleason	44ede0657f	Merge remote-tracking branch 'pleroma/develop' into staff-plug	2021-08-04 11:48:57 -05:00
Haelwenn (lanodan) Monnier	79e993cae5	Release 2.4.0	2021-08-01 08:26:39 +02:00
Haelwenn (lanodan) Monnier	5f8a9b671f	Update AdminFE bundle	2021-08-01 08:26:39 +02:00
feld	d8a986c9e8	Merge branch 'object-tombstone-visibility' into 'develop' ... Visibility: check Tombstone objects in visible_for_user?/2 See merge request pleroma/pleroma!3490	2021-07-27 16:25:34 +00:00
feld	7495beeb40	Merge branch 'errorview-json-fix' into 'develop' ... Fix errors in ErrorView See merge request pleroma/pleroma!3489	2021-07-27 16:24:53 +00:00
Alex Gleason	7f23dd6cc8	Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility	2021-07-27 08:54:26 -05:00
Alex Gleason	9cc8642b80	Visibility: check Tombstone objects in visible_for_user?/2	2021-07-27 08:54:01 -05:00
Alex Gleason	3d8ce61fe5	CHANGELOG: fixed JSON error rendering	2021-07-27 08:30:38 -05:00
Alex Gleason	33a19c002a	Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix	2021-07-27 08:29:53 -05:00
Alex Gleason	94db0b7cd6	Add activity+json to Phoenix :format_encoders ... Fixes ErrorView rendering	2021-07-27 08:28:52 -05:00
Haelwenn	7acdab1f30	Merge branch 'mkljczk-develop-patch-60115' into 'develop' ... MastodonAPI: Fix list timelines Closes mastofe#89 and #2693 See merge request pleroma/pleroma!3477	2021-07-22 18:41:11 +00:00
Alex Gleason	85d71d4f1d	CHANGELOG: Support poll notification type	2021-07-18 11:49:25 -05:00
Alex Gleason	62bf6d67e3	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	2021-07-18 11:49:22 -05:00
Alex Gleason	70f1496eb8	Poll notification: only notify local users	2021-07-18 11:10:23 -05:00
Alex Gleason	0b1c05ca1e	Poll notification: trigger PollWorker through common_pipeline	2021-07-18 11:10:23 -05:00
Alex Gleason	6a6e42c9bf	PollWorker defensive checks	2021-07-18 11:10:22 -05:00
Alex Gleason	cbd1a10c16	Poll notification: notify for polls even when block_from_strangers is set	2021-07-18 11:10:04 -05:00
Alex Gleason	0114754db2	MastodonAPI: Support poll notification	2021-07-17 22:19:38 -05:00
feld	3f58213646	Merge branch 'admin-api-users-sort' into 'develop' ... AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481	2021-07-14 14:39:14 +00:00
feld	17d79f3484	Merge branch 'admin-api-users-date' into 'develop' ... AdminAPI: add created_at date to users See merge request pleroma/pleroma!3482	2021-07-14 14:35:21 +00:00
Alex Gleason	117b3edf54	CHANGELOG: AdminAPI return date with users	2021-07-14 09:03:44 -05:00