Ivan Tashkinov 049ece1ef3 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex		2020-10-17 13:12:39 +03:00
..
mrf	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	2020-09-17 22:22:59 +03:00
object_validators	AttachmentValidator: directly embed url schema and pass it fix_media_type	2020-09-11 01:40:20 +02:00
views	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-15 16:39:01 -05:00
activity_pub.ex	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-15 16:39:01 -05:00
activity_pub_controller.ex	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
builder.ex	Add missing Copyright headers	2020-10-12 12:00:50 -05:00
internal_fetch_actor.ex	Update Copyrights	2020-03-03 16:44:49 -06:00
mrf.ex	Create MRF.filter_pipeline to inject :object_data when present	2020-09-17 22:07:54 +03:00
object_validator.ex	Pipeline Ingestion: Article	2020-09-11 01:40:20 +02:00
pipeline.ex	Create MRF.filter_pipeline to inject :object_data when present	2020-09-17 22:07:54 +03:00
publisher.ex	Federate data through persistent websocket connections	2020-09-18 11:58:22 +00:00
relay.ex	added force option to the unfollow operation	2020-09-28 09:16:42 +03:00
side_effects.ex	Change user.locked field to user.is_locked	2020-10-13 09:31:13 -05:00
transmogrifier.ex	transmogrifier: Drop incoming create early if it already exists	2020-09-23 13:40:45 +02:00
utils.ex	[#2791] AccountView: renamed :force option to :skip_visibility_check.	2020-07-23 15:08:30 +03:00
visibility.ex	[#3053] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.	2020-10-05 23:48:00 +03:00